aboutsummaryrefslogtreecommitdiffstats
path: root/d02.patch
diff options
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-07-14 13:59:04 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-07-14 13:59:04 +0200
commit5a7f345ba5e849229317f73497a17637c9a08e4a (patch)
tree4d7661b70e4da95d2acfddce1ba76b7b3190cd3f /d02.patch
parent1670862cd60c9110a93d8fdd186d4bfe51b185d1 (diff)
downloadpatches-5a7f345ba5e849229317f73497a17637c9a08e4a.tar.gz
get a bunch of stuff finally upstream.
Diffstat (limited to 'd02.patch')
-rw-r--r--d02.patch243
1 files changed, 0 insertions, 243 deletions
diff --git a/d02.patch b/d02.patch
deleted file mode 100644
index 528bcdf5de40b4..00000000000000
--- a/d02.patch
+++ /dev/null
@@ -1,243 +0,0 @@
-From foo@baz Thu Jun 8 15:02:46 CEST 2017
-Date: Thu, 08 Jun 2017 15:02:46 +0200
-To: Greg KH <gregkh@linuxfoundation.org>
-From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-Subject: IB: nes: convert to use DRIVER_ATTR_RW
-
-We are trying to get rid of DRIVER_ATTR(), and all of the nes.c driver
-attributes can be trivially changed to use DRIVER_ATTR_RW(), making the
-code smaller and easier to manage over time.
-
-Cc: Faisal Latif <faisal.latif@intel.com>
-Cc: Doug Ledford <dledford@redhat.com>
-Cc: Sean Hefty <sean.hefty@intel.com>
-Cc: Hal Rosenstock <hal.rosenstock@gmail.com>
-Cc: <linux-rdma@vger.kernel.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/infiniband/hw/nes/nes.c | 80 +++++++++++++++-------------------------
- 1 file changed, 31 insertions(+), 49 deletions(-)
-
---- a/drivers/infiniband/hw/nes/nes.c
-+++ b/drivers/infiniband/hw/nes/nes.c
-@@ -815,7 +815,7 @@ static struct pci_driver nes_pci_driver
- .remove = nes_remove,
- };
-
--static ssize_t nes_show_adapter(struct device_driver *ddp, char *buf)
-+static ssize_t adapter_show(struct device_driver *ddp, char *buf)
- {
- unsigned int devfn = 0xffffffff;
- unsigned char bus_number = 0xff;
-@@ -834,7 +834,7 @@ static ssize_t nes_show_adapter(struct d
- return snprintf(buf, PAGE_SIZE, "%x:%x\n", bus_number, devfn);
- }
-
--static ssize_t nes_store_adapter(struct device_driver *ddp,
-+static ssize_t adapter_store(struct device_driver *ddp,
- const char *buf, size_t count)
- {
- char *p = (char *)buf;
-@@ -843,7 +843,7 @@ static ssize_t nes_store_adapter(struct
- return strnlen(buf, count);
- }
-
--static ssize_t nes_show_ee_cmd(struct device_driver *ddp, char *buf)
-+static ssize_t eeprom_cmd_show(struct device_driver *ddp, char *buf)
- {
- u32 eeprom_cmd = 0xdead;
- u32 i = 0;
-@@ -859,7 +859,7 @@ static ssize_t nes_show_ee_cmd(struct de
- return snprintf(buf, PAGE_SIZE, "0x%x\n", eeprom_cmd);
- }
-
--static ssize_t nes_store_ee_cmd(struct device_driver *ddp,
-+static ssize_t eeprom_cmd_store(struct device_driver *ddp,
- const char *buf, size_t count)
- {
- char *p = (char *)buf;
-@@ -880,7 +880,7 @@ static ssize_t nes_store_ee_cmd(struct d
- return strnlen(buf, count);
- }
-
--static ssize_t nes_show_ee_data(struct device_driver *ddp, char *buf)
-+static ssize_t eeprom_data_show(struct device_driver *ddp, char *buf)
- {
- u32 eeprom_data = 0xdead;
- u32 i = 0;
-@@ -897,7 +897,7 @@ static ssize_t nes_show_ee_data(struct d
- return snprintf(buf, PAGE_SIZE, "0x%x\n", eeprom_data);
- }
-
--static ssize_t nes_store_ee_data(struct device_driver *ddp,
-+static ssize_t eeprom_data_store(struct device_driver *ddp,
- const char *buf, size_t count)
- {
- char *p = (char *)buf;
-@@ -918,7 +918,7 @@ static ssize_t nes_store_ee_data(struct
- return strnlen(buf, count);
- }
-
--static ssize_t nes_show_flash_cmd(struct device_driver *ddp, char *buf)
-+static ssize_t flash_cmd_show(struct device_driver *ddp, char *buf)
- {
- u32 flash_cmd = 0xdead;
- u32 i = 0;
-@@ -935,7 +935,7 @@ static ssize_t nes_show_flash_cmd(struct
- return snprintf(buf, PAGE_SIZE, "0x%x\n", flash_cmd);
- }
-
--static ssize_t nes_store_flash_cmd(struct device_driver *ddp,
-+static ssize_t flash_cmd_store(struct device_driver *ddp,
- const char *buf, size_t count)
- {
- char *p = (char *)buf;
-@@ -956,7 +956,7 @@ static ssize_t nes_store_flash_cmd(struc
- return strnlen(buf, count);
- }
-
--static ssize_t nes_show_flash_data(struct device_driver *ddp, char *buf)
-+static ssize_t flash_data_show(struct device_driver *ddp, char *buf)
- {
- u32 flash_data = 0xdead;
- u32 i = 0;
-@@ -973,7 +973,7 @@ static ssize_t nes_show_flash_data(struc
- return snprintf(buf, PAGE_SIZE, "0x%x\n", flash_data);
- }
-
--static ssize_t nes_store_flash_data(struct device_driver *ddp,
-+static ssize_t flash_data_store(struct device_driver *ddp,
- const char *buf, size_t count)
- {
- char *p = (char *)buf;
-@@ -994,12 +994,12 @@ static ssize_t nes_store_flash_data(stru
- return strnlen(buf, count);
- }
-
--static ssize_t nes_show_nonidx_addr(struct device_driver *ddp, char *buf)
-+static ssize_t nonidx_addr_show(struct device_driver *ddp, char *buf)
- {
- return snprintf(buf, PAGE_SIZE, "0x%x\n", sysfs_nonidx_addr);
- }
-
--static ssize_t nes_store_nonidx_addr(struct device_driver *ddp,
-+static ssize_t nonidx_addr_store(struct device_driver *ddp,
- const char *buf, size_t count)
- {
- char *p = (char *)buf;
-@@ -1010,7 +1010,7 @@ static ssize_t nes_store_nonidx_addr(str
- return strnlen(buf, count);
- }
-
--static ssize_t nes_show_nonidx_data(struct device_driver *ddp, char *buf)
-+static ssize_t nonidx_data_show(struct device_driver *ddp, char *buf)
- {
- u32 nonidx_data = 0xdead;
- u32 i = 0;
-@@ -1027,7 +1027,7 @@ static ssize_t nes_show_nonidx_data(stru
- return snprintf(buf, PAGE_SIZE, "0x%x\n", nonidx_data);
- }
-
--static ssize_t nes_store_nonidx_data(struct device_driver *ddp,
-+static ssize_t nonidx_data_store(struct device_driver *ddp,
- const char *buf, size_t count)
- {
- char *p = (char *)buf;
-@@ -1048,12 +1048,12 @@ static ssize_t nes_store_nonidx_data(str
- return strnlen(buf, count);
- }
-
--static ssize_t nes_show_idx_addr(struct device_driver *ddp, char *buf)
-+static ssize_t idx_addr_show(struct device_driver *ddp, char *buf)
- {
- return snprintf(buf, PAGE_SIZE, "0x%x\n", sysfs_idx_addr);
- }
-
--static ssize_t nes_store_idx_addr(struct device_driver *ddp,
-+static ssize_t idx_addr_store(struct device_driver *ddp,
- const char *buf, size_t count)
- {
- char *p = (char *)buf;
-@@ -1064,7 +1064,7 @@ static ssize_t nes_store_idx_addr(struct
- return strnlen(buf, count);
- }
-
--static ssize_t nes_show_idx_data(struct device_driver *ddp, char *buf)
-+static ssize_t idx_data_show(struct device_driver *ddp, char *buf)
- {
- u32 idx_data = 0xdead;
- u32 i = 0;
-@@ -1081,7 +1081,7 @@ static ssize_t nes_show_idx_data(struct
- return snprintf(buf, PAGE_SIZE, "0x%x\n", idx_data);
- }
-
--static ssize_t nes_store_idx_data(struct device_driver *ddp,
-+static ssize_t idx_data_store(struct device_driver *ddp,
- const char *buf, size_t count)
- {
- char *p = (char *)buf;
-@@ -1102,11 +1102,7 @@ static ssize_t nes_store_idx_data(struct
- return strnlen(buf, count);
- }
-
--
--/**
-- * nes_show_wqm_quanta
-- */
--static ssize_t nes_show_wqm_quanta(struct device_driver *ddp, char *buf)
-+static ssize_t wqm_quanta_show(struct device_driver *ddp, char *buf)
- {
- u32 wqm_quanta_value = 0xdead;
- u32 i = 0;
-@@ -1123,12 +1119,8 @@ static ssize_t nes_show_wqm_quanta(struc
- return snprintf(buf, PAGE_SIZE, "0x%X\n", wqm_quanta_value);
- }
-
--
--/**
-- * nes_store_wqm_quanta
-- */
--static ssize_t nes_store_wqm_quanta(struct device_driver *ddp,
-- const char *buf, size_t count)
-+static ssize_t wqm_quanta_store(struct device_driver *ddp, const char *buf,
-+ size_t count)
- {
- unsigned long wqm_quanta_value;
- u32 wqm_config1;
-@@ -1153,26 +1145,16 @@ static ssize_t nes_store_wqm_quanta(stru
- return strnlen(buf, count);
- }
-
--static DRIVER_ATTR(adapter, S_IRUSR | S_IWUSR,
-- nes_show_adapter, nes_store_adapter);
--static DRIVER_ATTR(eeprom_cmd, S_IRUSR | S_IWUSR,
-- nes_show_ee_cmd, nes_store_ee_cmd);
--static DRIVER_ATTR(eeprom_data, S_IRUSR | S_IWUSR,
-- nes_show_ee_data, nes_store_ee_data);
--static DRIVER_ATTR(flash_cmd, S_IRUSR | S_IWUSR,
-- nes_show_flash_cmd, nes_store_flash_cmd);
--static DRIVER_ATTR(flash_data, S_IRUSR | S_IWUSR,
-- nes_show_flash_data, nes_store_flash_data);
--static DRIVER_ATTR(nonidx_addr, S_IRUSR | S_IWUSR,
-- nes_show_nonidx_addr, nes_store_nonidx_addr);
--static DRIVER_ATTR(nonidx_data, S_IRUSR | S_IWUSR,
-- nes_show_nonidx_data, nes_store_nonidx_data);
--static DRIVER_ATTR(idx_addr, S_IRUSR | S_IWUSR,
-- nes_show_idx_addr, nes_store_idx_addr);
--static DRIVER_ATTR(idx_data, S_IRUSR | S_IWUSR,
-- nes_show_idx_data, nes_store_idx_data);
--static DRIVER_ATTR(wqm_quanta, S_IRUSR | S_IWUSR,
-- nes_show_wqm_quanta, nes_store_wqm_quanta);
-+static DRIVER_ATTR_RW(adapter);
-+static DRIVER_ATTR_RW(eeprom_cmd);
-+static DRIVER_ATTR_RW(eeprom_data);
-+static DRIVER_ATTR_RW(flash_cmd);
-+static DRIVER_ATTR_RW(flash_data);
-+static DRIVER_ATTR_RW(nonidx_addr);
-+static DRIVER_ATTR_RW(nonidx_data);
-+static DRIVER_ATTR_RW(idx_addr);
-+static DRIVER_ATTR_RW(idx_data);
-+static DRIVER_ATTR_RW(wqm_quanta);
-
- static int nes_create_driver_sysfs(struct pci_driver *drv)
- {