Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-09-29 11:23:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

[PATCH] libertas: fix build breakage from netdev class_device -> device

Browse Source 
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
John W. Linville 2007-02-27 14:39:04 -05:00 committed by Jeff Garzik
parent ebb4e07e35
commit b3f1b8cf11
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/net/wireless/libertas/main.c
View File

@ -186,12 +186,12 @@ static u8 *default_fw_name = "usb8388.bin";
/** /**
* Attributes exported through sysfs * Attributes exported through sysfs
*/ */
#define to_net_dev(class) container_of(class, struct net_device, class_dev)
/** /**
* @brief Get function for sysfs attribute libertas_mpp * @brief Get function for sysfs attribute libertas_mpp
*/ */
static ssize_t libertas_mpp_get(struct class_device * dev, char * buf) { static ssize_t libertas_mpp_get(struct device * dev,
struct device_attribute *attr, char * buf) {
struct cmd_ds_mesh_access mesh_access; struct cmd_ds_mesh_access mesh_access;
memset(&mesh_access, 0, sizeof(mesh_access)); memset(&mesh_access, 0, sizeof(mesh_access));
@ -206,8 +206,8 @@ static ssize_t libertas_mpp_get(struct class_device * dev, char * buf) {
/** /**
* @brief Set function for sysfs attribute libertas_mpp * @brief Set function for sysfs attribute libertas_mpp
*/ */
static ssize_t libertas_mpp_set(struct class_device * dev, const char * buf, static ssize_t libertas_mpp_set(struct device * dev,
size_t count) { struct device_attribute *attr, const char * buf, size_t count) {
struct cmd_ds_mesh_access mesh_access; struct cmd_ds_mesh_access mesh_access;
@ -224,7 +224,7 @@ static ssize_t libertas_mpp_set(struct class_device * dev, const char * buf,
* libertas_mpp attribute to be exported per mshX interface * libertas_mpp attribute to be exported per mshX interface
* through sysfs (/sys/class/net/mshX/libertas-mpp) * through sysfs (/sys/class/net/mshX/libertas-mpp)
*/ */
static CLASS_DEVICE_ATTR(libertas_mpp, 0644, libertas_mpp_get, static DEVICE_ATTR(libertas_mpp, 0644, libertas_mpp_get,
libertas_mpp_set ); libertas_mpp_set );
/** /**
@ -998,14 +998,14 @@ wlan_private *wlan_add_card(void *card)
if (!(wlan_pm_dev = pm_register(PM_UNKNOWN_DEV, 0, wlan_pm_callback))) if (!(wlan_pm_dev = pm_register(PM_UNKNOWN_DEV, 0, wlan_pm_callback)))
lbs_pr_alert( "failed to register PM callback\n"); lbs_pr_alert( "failed to register PM callback\n");
#endif #endif
if (class_device_create_file(&(mesh_dev->class_dev), &class_device_attr_libertas_mpp)) if (device_create_file(&(mesh_dev->dev), &dev_attr_libertas_mpp))
goto err_create_file; goto err_create_file;
LEAVE(); LEAVE();
return priv; return priv;
err_create_file: err_create_file:
class_device_remove_file(&(mesh_dev->class_dev), &class_device_attr_libertas_mpp); device_remove_file(&(mesh_dev->dev), &dev_attr_libertas_mpp);
err_init_fw: err_init_fw:
libertas_sbi_unregister_dev(priv); libertas_sbi_unregister_dev(priv);
err_registerdev: err_registerdev:
@ -1069,7 +1069,7 @@ int wlan_remove_card(void *card)
wake_pending_cmdnodes(priv); wake_pending_cmdnodes(priv);
class_device_remove_file(&(mesh_dev->class_dev), &class_device_attr_libertas_mpp); device_remove_file(&(mesh_dev->dev), &dev_attr_libertas_mpp);
unregister_netdev(mesh_dev); unregister_netdev(mesh_dev);
unregister_netdev(dev); unregister_netdev(dev);