bcm43xx: sysfs code cleanup
Subsystems (3)
PATCH 1/1 bcm43xx: sysfs code cleanup
This should also go in before 2.6.17
---
This cleans up the bcm43xx sysfs code and makes it compliant with the unwritten sysfs rules (at least I hope so).
Signed-off-by Michael Buesch <[email protected]>
drivers/net/wireless/bcm43xx/bcm43xx.h +14 -3
@@ -15,7 +15,6 @@#include "bcm43xx_debugfs.h" #include "bcm43xx_leds.h" -#include "bcm43xx_sysfs.h" #define PFX KBUILD_MODNAME ": "
@@ -638,8 +637,6 @@ };struct bcm43xx_private { -struct bcm43xx_sysfs sysfs; -struct ieee80211_device *ieee;struct ieee80211softmac_device *softmac;
@@ -772,6 +769,20 @@return ieee80211softmac_priv (dev); } +struct device ; + +static inline +struct bcm43xx_private *dev_to_bcm (struct device *dev) +{ +struct net_device *net_dev; +struct bcm43xx_private *bcm; + + net_dev =dev_get_drvdata (dev); + bcm =bcm43xx_priv (net_dev); + +return bcm; +} +/* Helper function, which returns a boolean. * TRUE, if PIO is used; FALSE, if DMA is used.
drivers/net/wireless/bcm43xx/bcm43xx_main.c +1 -0
@@ -52,6 +52,7 @@#include "bcm43xx_wx.h" #include "bcm43xx_ethtool.h" #include "bcm43xx_xmit.h" +#include "bcm43xx_sysfs.h" MODULE_DESCRIPTION ("Broadcom BCM43xx wireless driver" );
drivers/net/wireless/bcm43xx/bcm43xx_sysfs.c +67 -48
217 lines not on this page · raw message
drivers/net/wireless/bcm43xx/bcm43xx_sysfs.h +0 -16
@@ -1,22 +1,6 @@#ifndef BCM43xx_SYSFS_H_#define BCM43xx_SYSFS_H_ -#include <linux/device.h> - - -struct bcm43xx_sysfs { -struct device_attribute attr_sprom; -struct device_attribute attr_interfmode; -struct device_attribute attr_preamble; -}; - -#define devattr_to_bcm (attr, attr_name) ({ \ - struct bcm43xx_sysfs *__s; struct bcm43xx_private *__p; \ - __s = container_of((attr), struct bcm43xx_sysfs, attr_name); \ - __p = container_of(__s, struct bcm43xx_private, sysfs); \ - __p; \ - }) -struct bcm43xx_private ;int bcm43xx_sysfs_register (struct bcm43xx_private *bcm);
Signature · 1 line
Greetings Michael.