diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-11-30 15:37:22 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-11-30 15:37:22 +0100 |
| commit | 946cb48082b0bbff0bb96b3f816d0327bf409d79 (patch) | |
| tree | ddf24fb1cffad74877ccd6d4c3421cf8e6cc5bb8 /d08.patch | |
| parent | 3c37d678907cad7f656ff2d3f1d7d9781cf90b58 (diff) | |
| download | patches-946cb48082b0bbff0bb96b3f816d0327bf409d79.tar.gz | |
more patches updated
Diffstat (limited to 'd08.patch')
| -rw-r--r-- | d08.patch | 61 |
1 files changed, 61 insertions, 0 deletions
diff --git a/d08.patch b/d08.patch new file mode 100644 index 00000000000000..0bb621a5adb6b7 --- /dev/null +++ b/d08.patch @@ -0,0 +1,61 @@ +--- + 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) + { |