aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2007-02-27 14:39:04 -0500
committerJeff Garzik <jeff@garzik.org>2007-04-28 11:00:55 -0400
commitb3f1b8cf11e412367a35045a60abbbd2ada5f75d (patch)
tree4742d508e68ada3ded07bc1e1cd33ba1d4fdeaa5 /drivers
parentebb4e07e351e456216681f9bcf6bc4a5f0f7f55b (diff)
[PATCH] libertas: fix build breakage from netdev class_device -> device
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/wireless/libertas/main.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/net/wireless/libertas/main.c b/drivers/net/wireless/libertas/main.c
index 497046530117..dcbf102a057e 100644
--- a/drivers/net/wireless/libertas/main.c
+++ b/drivers/net/wireless/libertas/main.c
@@ -186,12 +186,12 @@ static u8 *default_fw_name = "usb8388.bin";
186/** 186/**
187 * Attributes exported through sysfs 187 * Attributes exported through sysfs
188 */ 188 */
189#define to_net_dev(class) container_of(class, struct net_device, class_dev)
190 189
191/** 190/**
192 * @brief Get function for sysfs attribute libertas_mpp 191 * @brief Get function for sysfs attribute libertas_mpp
193 */ 192 */
194static ssize_t libertas_mpp_get(struct class_device * dev, char * buf) { 193static ssize_t libertas_mpp_get(struct device * dev,
194 struct device_attribute *attr, char * buf) {
195 struct cmd_ds_mesh_access mesh_access; 195 struct cmd_ds_mesh_access mesh_access;
196 196
197 memset(&mesh_access, 0, sizeof(mesh_access)); 197 memset(&mesh_access, 0, sizeof(mesh_access));
@@ -206,8 +206,8 @@ static ssize_t libertas_mpp_get(struct class_device * dev, char * buf) {
206/** 206/**
207 * @brief Set function for sysfs attribute libertas_mpp 207 * @brief Set function for sysfs attribute libertas_mpp
208 */ 208 */
209static ssize_t libertas_mpp_set(struct class_device * dev, const char * buf, 209static ssize_t libertas_mpp_set(struct device * dev,
210 size_t count) { 210 struct device_attribute *attr, const char * buf, size_t count) {
211 struct cmd_ds_mesh_access mesh_access; 211 struct cmd_ds_mesh_access mesh_access;
212 212
213 213
@@ -224,7 +224,7 @@ static ssize_t libertas_mpp_set(struct class_device * dev, const char * buf,
224 * libertas_mpp attribute to be exported per mshX interface 224 * libertas_mpp attribute to be exported per mshX interface
225 * through sysfs (/sys/class/net/mshX/libertas-mpp) 225 * through sysfs (/sys/class/net/mshX/libertas-mpp)
226 */ 226 */
227static CLASS_DEVICE_ATTR(libertas_mpp, 0644, libertas_mpp_get, 227static DEVICE_ATTR(libertas_mpp, 0644, libertas_mpp_get,
228 libertas_mpp_set ); 228 libertas_mpp_set );
229 229
230/** 230/**
@@ -998,14 +998,14 @@ wlan_private *wlan_add_card(void *card)
998 if (!(wlan_pm_dev = pm_register(PM_UNKNOWN_DEV, 0, wlan_pm_callback))) 998 if (!(wlan_pm_dev = pm_register(PM_UNKNOWN_DEV, 0, wlan_pm_callback)))
999 lbs_pr_alert( "failed to register PM callback\n"); 999 lbs_pr_alert( "failed to register PM callback\n");
1000#endif 1000#endif
1001 if (class_device_create_file(&(mesh_dev->class_dev), &class_device_attr_libertas_mpp)) 1001 if (device_create_file(&(mesh_dev->dev), &dev_attr_libertas_mpp))
1002 goto err_create_file; 1002 goto err_create_file;
1003 1003
1004 LEAVE(); 1004 LEAVE();
1005 return priv; 1005 return priv;
1006 1006
1007err_create_file: 1007err_create_file:
1008 class_device_remove_file(&(mesh_dev->class_dev), &class_device_attr_libertas_mpp); 1008 device_remove_file(&(mesh_dev->dev), &dev_attr_libertas_mpp);
1009err_init_fw: 1009err_init_fw:
1010 libertas_sbi_unregister_dev(priv); 1010 libertas_sbi_unregister_dev(priv);
1011err_registerdev: 1011err_registerdev:
@@ -1069,7 +1069,7 @@ int wlan_remove_card(void *card)
1069 1069
1070 wake_pending_cmdnodes(priv); 1070 wake_pending_cmdnodes(priv);
1071 1071
1072 class_device_remove_file(&(mesh_dev->class_dev), &class_device_attr_libertas_mpp); 1072 device_remove_file(&(mesh_dev->dev), &dev_attr_libertas_mpp);
1073 unregister_netdev(mesh_dev); 1073 unregister_netdev(mesh_dev);
1074 unregister_netdev(dev); 1074 unregister_netdev(dev);
1075 1075