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

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
...@@ -4160,12 +4160,12 @@ static ssize_t show_bssinfo(struct device *d, struct device_attribute *attr, ...@@ -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); static DEVICE_ATTR(bssinfo, S_IRUGO, show_bssinfo, NULL);
#ifdef CONFIG_IPW2100_DEBUG #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); 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) const char *buf, size_t count)
{ {
u32 val; u32 val;
...@@ -4179,9 +4179,7 @@ static ssize_t store_debug_level(struct device_driver *d, ...@@ -4179,9 +4179,7 @@ static ssize_t store_debug_level(struct device_driver *d,
return strnlen(buf, count); return strnlen(buf, count);
} }
static DRIVER_ATTR_RW(debug_level);
static DRIVER_ATTR(debug_level, S_IWUSR | S_IRUGO, show_debug_level,
store_debug_level);
#endif /* CONFIG_IPW2100_DEBUG */ #endif /* CONFIG_IPW2100_DEBUG */
static ssize_t show_fatal_error(struct device *d, static ssize_t show_fatal_error(struct device *d,
......
...@@ -1195,12 +1195,12 @@ static void ipw_led_shutdown(struct ipw_priv *priv) ...@@ -1195,12 +1195,12 @@ static void ipw_led_shutdown(struct ipw_priv *priv)
* *
* See the level definitions in ipw for details. * 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); 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) size_t count)
{ {
char *p = (char *)buf; char *p = (char *)buf;
...@@ -1221,9 +1221,7 @@ static ssize_t store_debug_level(struct device_driver *d, const char *buf, ...@@ -1221,9 +1221,7 @@ static ssize_t store_debug_level(struct device_driver *d, const char *buf,
return strnlen(buf, count); return strnlen(buf, count);
} }
static DRIVER_ATTR_RW(debug_level);
static DRIVER_ATTR(debug_level, S_IWUSR | S_IRUGO,
show_debug_level, store_debug_level);
static inline u32 ipw_get_event_log_len(struct ipw_priv *priv) static inline u32 ipw_get_event_log_len(struct ipw_priv *priv)
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment