diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-07-14 13:59:04 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-07-14 13:59:04 +0200 |
| commit | 5a7f345ba5e849229317f73497a17637c9a08e4a (patch) | |
| tree | 4d7661b70e4da95d2acfddce1ba76b7b3190cd3f /d08.patch | |
| parent | 1670862cd60c9110a93d8fdd186d4bfe51b185d1 (diff) | |
| download | patches-5a7f345ba5e849229317f73497a17637c9a08e4a.tar.gz | |
get a bunch of stuff finally upstream.
Diffstat (limited to 'd08.patch')
| -rw-r--r-- | d08.patch | 75 |
1 files changed, 0 insertions, 75 deletions
diff --git a/d08.patch b/d08.patch deleted file mode 100644 index 2f3a3065268a20..00000000000000 --- a/d08.patch +++ /dev/null @@ -1,75 +0,0 @@ -From foo@baz Thu Jun 8 15:03:24 CEST 2017 -Date: Thu, 08 Jun 2017 15:03:24 +0200 -To: Greg KH <gregkh@linuxfoundation.org> -From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> -Subject: 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: Greg Kroah-Hartman <gregkh@linuxfoundation.org> ---- - 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) - { |