diff options
| -rw-r--r-- | d01.patch | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/d01.patch b/d01.patch index db705b84391c4b..e6b386ac0dc096 100644 --- a/d01.patch +++ b/d01.patch @@ -11,7 +11,7 @@ --- a/drivers/hid/hid-core.c +++ b/drivers/hid/hid-core.c -@@ -1899,7 +1899,7 @@ struct hid_dynid { +@@ -1902,7 +1902,7 @@ struct hid_dynid { * Adds a new dynamic hid device ID to this driver, * and causes the driver to probe for all devices again. */ @@ -20,7 +20,7 @@ size_t count) { struct hid_driver *hdrv = container_of(drv, struct hid_driver, driver); -@@ -1931,7 +1931,13 @@ static ssize_t store_new_id(struct devic +@@ -1934,7 +1934,13 @@ static ssize_t store_new_id(struct devic return ret ? : count; } @@ -35,7 +35,7 @@ static void hid_free_dynids(struct hid_driver *hdrv) { -@@ -2091,6 +2097,7 @@ static int hid_uevent(struct device *dev +@@ -2094,6 +2100,7 @@ static int hid_uevent(struct device *dev static struct bus_type hid_bus_type = { .name = "hid", .dev_groups = hid_dev_groups, @@ -43,7 +43,7 @@ .match = hid_bus_match, .probe = hid_device_probe, .remove = hid_device_remove, -@@ -2528,8 +2535,6 @@ EXPORT_SYMBOL_GPL(hid_destroy_device); +@@ -2532,8 +2539,6 @@ EXPORT_SYMBOL_GPL(hid_destroy_device); int __hid_register_driver(struct hid_driver *hdrv, struct module *owner, const char *mod_name) { @@ -52,7 +52,7 @@ hdrv->driver.name = hdrv->name; hdrv->driver.bus = &hid_bus_type; hdrv->driver.owner = owner; -@@ -2538,21 +2543,12 @@ int __hid_register_driver(struct hid_dri +@@ -2542,21 +2547,12 @@ int __hid_register_driver(struct hid_dri INIT_LIST_HEAD(&hdrv->dyn_list); spin_lock_init(&hdrv->dyn_lock); @@ -77,7 +77,7 @@ } --- 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 +@@ -818,7 +818,7 @@ static struct pci_driver nes_pci_driver .remove = nes_remove, }; @@ -86,7 +86,7 @@ { unsigned int devfn = 0xffffffff; unsigned char bus_number = 0xff; -@@ -834,7 +834,7 @@ static ssize_t nes_show_adapter(struct d +@@ -837,7 +837,7 @@ static ssize_t nes_show_adapter(struct d return snprintf(buf, PAGE_SIZE, "%x:%x\n", bus_number, devfn); } @@ -95,7 +95,7 @@ const char *buf, size_t count) { char *p = (char *)buf; -@@ -843,7 +843,7 @@ static ssize_t nes_store_adapter(struct +@@ -846,7 +846,7 @@ static ssize_t nes_store_adapter(struct return strnlen(buf, count); } @@ -104,7 +104,7 @@ { u32 eeprom_cmd = 0xdead; u32 i = 0; -@@ -859,7 +859,7 @@ static ssize_t nes_show_ee_cmd(struct de +@@ -862,7 +862,7 @@ static ssize_t nes_show_ee_cmd(struct de return snprintf(buf, PAGE_SIZE, "0x%x\n", eeprom_cmd); } @@ -113,7 +113,7 @@ const char *buf, size_t count) { char *p = (char *)buf; -@@ -880,7 +880,7 @@ static ssize_t nes_store_ee_cmd(struct d +@@ -883,7 +883,7 @@ static ssize_t nes_store_ee_cmd(struct d return strnlen(buf, count); } @@ -122,7 +122,7 @@ { u32 eeprom_data = 0xdead; u32 i = 0; -@@ -897,7 +897,7 @@ static ssize_t nes_show_ee_data(struct d +@@ -900,7 +900,7 @@ static ssize_t nes_show_ee_data(struct d return snprintf(buf, PAGE_SIZE, "0x%x\n", eeprom_data); } @@ -131,7 +131,7 @@ const char *buf, size_t count) { char *p = (char *)buf; -@@ -918,7 +918,7 @@ static ssize_t nes_store_ee_data(struct +@@ -921,7 +921,7 @@ static ssize_t nes_store_ee_data(struct return strnlen(buf, count); } @@ -140,7 +140,7 @@ { u32 flash_cmd = 0xdead; u32 i = 0; -@@ -935,7 +935,7 @@ static ssize_t nes_show_flash_cmd(struct +@@ -938,7 +938,7 @@ static ssize_t nes_show_flash_cmd(struct return snprintf(buf, PAGE_SIZE, "0x%x\n", flash_cmd); } @@ -149,7 +149,7 @@ const char *buf, size_t count) { char *p = (char *)buf; -@@ -956,7 +956,7 @@ static ssize_t nes_store_flash_cmd(struc +@@ -959,7 +959,7 @@ static ssize_t nes_store_flash_cmd(struc return strnlen(buf, count); } @@ -158,7 +158,7 @@ { u32 flash_data = 0xdead; u32 i = 0; -@@ -973,7 +973,7 @@ static ssize_t nes_show_flash_data(struc +@@ -976,7 +976,7 @@ static ssize_t nes_show_flash_data(struc return snprintf(buf, PAGE_SIZE, "0x%x\n", flash_data); } @@ -167,7 +167,7 @@ const char *buf, size_t count) { char *p = (char *)buf; -@@ -994,12 +994,12 @@ static ssize_t nes_store_flash_data(stru +@@ -997,12 +997,12 @@ static ssize_t nes_store_flash_data(stru return strnlen(buf, count); } @@ -182,7 +182,7 @@ const char *buf, size_t count) { char *p = (char *)buf; -@@ -1010,7 +1010,7 @@ static ssize_t nes_store_nonidx_addr(str +@@ -1013,7 +1013,7 @@ static ssize_t nes_store_nonidx_addr(str return strnlen(buf, count); } @@ -191,7 +191,7 @@ { u32 nonidx_data = 0xdead; u32 i = 0; -@@ -1027,7 +1027,7 @@ static ssize_t nes_show_nonidx_data(stru +@@ -1030,7 +1030,7 @@ static ssize_t nes_show_nonidx_data(stru return snprintf(buf, PAGE_SIZE, "0x%x\n", nonidx_data); } @@ -200,7 +200,7 @@ const char *buf, size_t count) { char *p = (char *)buf; -@@ -1048,12 +1048,12 @@ static ssize_t nes_store_nonidx_data(str +@@ -1051,12 +1051,12 @@ static ssize_t nes_store_nonidx_data(str return strnlen(buf, count); } @@ -215,7 +215,7 @@ const char *buf, size_t count) { char *p = (char *)buf; -@@ -1064,7 +1064,7 @@ static ssize_t nes_store_idx_addr(struct +@@ -1067,7 +1067,7 @@ static ssize_t nes_store_idx_addr(struct return strnlen(buf, count); } @@ -224,7 +224,7 @@ { u32 idx_data = 0xdead; u32 i = 0; -@@ -1081,7 +1081,7 @@ static ssize_t nes_show_idx_data(struct +@@ -1084,7 +1084,7 @@ static ssize_t nes_show_idx_data(struct return snprintf(buf, PAGE_SIZE, "0x%x\n", idx_data); } @@ -233,7 +233,7 @@ const char *buf, size_t count) { char *p = (char *)buf; -@@ -1102,11 +1102,7 @@ static ssize_t nes_store_idx_data(struct +@@ -1105,11 +1105,7 @@ static ssize_t nes_store_idx_data(struct return strnlen(buf, count); } @@ -246,7 +246,7 @@ { u32 wqm_quanta_value = 0xdead; u32 i = 0; -@@ -1123,12 +1119,8 @@ static ssize_t nes_show_wqm_quanta(struc +@@ -1126,12 +1122,8 @@ static ssize_t nes_show_wqm_quanta(struc return snprintf(buf, PAGE_SIZE, "0x%X\n", wqm_quanta_value); } @@ -261,7 +261,7 @@ { unsigned long wqm_quanta_value; u32 wqm_config1; -@@ -1153,26 +1145,16 @@ static ssize_t nes_store_wqm_quanta(stru +@@ -1156,26 +1148,16 @@ static ssize_t nes_store_wqm_quanta(stru return strnlen(buf, count); } |