| --- |
| drivers/net/wireless/intel/ipw2x00/ipw2100.c | 8 +++----- |
| drivers/net/wireless/intel/ipw2x00/ipw2200.c | 8 +++----- |
| 2 files changed, 6 insertions(+), 10 deletions(-) |
| |
| --- a/drivers/net/wireless/intel/ipw2x00/ipw2100.c |
| +++ b/drivers/net/wireless/intel/ipw2x00/ipw2100.c |
| @@ -4160,12 +4160,12 @@ static ssize_t show_bssinfo(struct devic |
| 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 |
| |
| 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, |
| --- a/drivers/net/wireless/intel/ipw2x00/ipw2200.c |
| +++ b/drivers/net/wireless/intel/ipw2x00/ipw2200.c |
| @@ -1195,12 +1195,12 @@ static void ipw_led_shutdown(struct ipw_ |
| * |
| * 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 |
| |
| 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) |
| { |