aboutsummaryrefslogtreecommitdiffstats
path: root/d02.patch
diff options
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-11-28 17:15:12 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-11-28 17:15:12 +0100
commit3c37d678907cad7f656ff2d3f1d7d9781cf90b58 (patch)
treed13e7cf127bf245f02051652a18a6c4a81676903 /d02.patch
parent8617ccb8a6b3029e50b9fa2c8097a7e7ab88fc6b (diff)
downloadpatches-3c37d678907cad7f656ff2d3f1d7d9781cf90b58.tar.gz
old patches broken up and refreshed
Diffstat (limited to 'd02.patch')
-rw-r--r--d02.patch227
1 files changed, 227 insertions, 0 deletions
diff --git a/d02.patch b/d02.patch
new file mode 100644
index 00000000000000..c08738f3ea2631
--- /dev/null
+++ b/d02.patch
@@ -0,0 +1,227 @@
+---
+ 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
+@@ -817,7 +817,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;
+@@ -836,7 +836,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;
+@@ -845,7 +845,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;
+@@ -861,7 +861,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;
+@@ -882,7 +882,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;
+@@ -899,7 +899,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;
+@@ -920,7 +920,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;
+@@ -937,7 +937,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;
+@@ -958,7 +958,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;
+@@ -975,7 +975,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;
+@@ -996,12 +996,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;
+@@ -1012,7 +1012,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;
+@@ -1029,7 +1029,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;
+@@ -1050,12 +1050,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;
+@@ -1066,7 +1066,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;
+@@ -1083,7 +1083,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;
+@@ -1104,11 +1104,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;
+@@ -1125,12 +1121,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;
+@@ -1155,26 +1147,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)
+ {