Commit 0457e1ae authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

wireless: ipw2x00: convert to use DRIVER_ATTR_RW 



We are trying to get rid of DRIVER_ATTR(), and the ipw2x00 driver's
attributes can be trivially changed to use DRIVER_ATTR_RW().

Cc: Stanislav Yakovlev <stas.yakovlev@gmail.com>
Cc: Kalle Valo <kvalo@codeaurora.org>
Cc: <linux-wireless@vger.kernel.org>
Cc: <netdev@vger.kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent ce8e0cd8

drivers/net/wireless/intel/ipw2x00/ipw2100.c

+3 −5
Original line number Diff line number Diff line
@@ -4160,12 +4160,12 @@ static ssize_t show_bssinfo(struct device *d, struct device_attribute *attr, 
static DEVICE_ATTR(bssinfo, S_IRUGO, show_bssinfo, NULL);



#ifdef CONFIG_IPW2100_DEBUG

static ssize_t show_debug_level(struct device_driver *d, char *buf)

static ssize_t debug_level_show(struct device_driver *d, char *buf)

{

	return sprintf(buf, "0x%08X\n", ipw2100_debug_level);

}



static ssize_t store_debug_level(struct device_driver *d,

static ssize_t debug_level_store(struct device_driver *d,

				 const char *buf, size_t count)

{

	u32 val;
@@ -4179,9 +4179,7 @@ static ssize_t store_debug_level(struct device_driver *d, 


	return strnlen(buf, count);

}



static DRIVER_ATTR(debug_level, S_IWUSR | S_IRUGO, show_debug_level,

		   store_debug_level);

static DRIVER_ATTR_RW(debug_level);

#endif				/* CONFIG_IPW2100_DEBUG */



static ssize_t show_fatal_error(struct device *d,

drivers/net/wireless/intel/ipw2x00/ipw2200.c

+3 −5
Original line number Diff line number Diff line
@@ -1195,12 +1195,12 @@ static void ipw_led_shutdown(struct ipw_priv *priv) 
 *

 * See the level definitions in ipw for details.

 */

static ssize_t show_debug_level(struct device_driver *d, char *buf)

static ssize_t debug_level_show(struct device_driver *d, char *buf)

{

	return sprintf(buf, "0x%08X\n", ipw_debug_level);

}



static ssize_t store_debug_level(struct device_driver *d, const char *buf,

static ssize_t debug_level_store(struct device_driver *d, const char *buf,

				 size_t count)

{

	char *p = (char *)buf;
@@ -1221,9 +1221,7 @@ static ssize_t store_debug_level(struct device_driver *d, const char *buf, 


	return strnlen(buf, count);

}



static DRIVER_ATTR(debug_level, S_IWUSR | S_IRUGO,

		   show_debug_level, store_debug_level);

static DRIVER_ATTR_RW(debug_level);



static inline u32 ipw_get_event_log_len(struct ipw_priv *priv)

{

CRA Git | Maintained and supported by SUSTech CRA and CCSE