diff options
Diffstat (limited to 'd01.patch')
| -rw-r--r-- | d01.patch | 82 |
1 files changed, 41 insertions, 41 deletions
diff --git a/d01.patch b/d01.patch index 5ba0a410a05afd..40c12ee930460b 100644 --- a/d01.patch +++ b/d01.patch @@ -11,7 +11,7 @@ --- a/drivers/hid/hid-core.c +++ b/drivers/hid/hid-core.c -@@ -1946,7 +1946,7 @@ struct hid_dynid { +@@ -1985,7 +1985,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); -@@ -1978,7 +1978,13 @@ static ssize_t store_new_id(struct devic +@@ -2017,7 +2017,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) { -@@ -2138,6 +2144,7 @@ static int hid_uevent(struct device *dev +@@ -2177,6 +2183,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, -@@ -2585,8 +2592,6 @@ EXPORT_SYMBOL_GPL(hid_destroy_device); +@@ -2624,8 +2631,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; -@@ -2595,21 +2600,12 @@ int __hid_register_driver(struct hid_dri +@@ -2634,21 +2639,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 -@@ -818,7 +818,7 @@ static struct pci_driver nes_pci_driver +@@ -841,7 +841,7 @@ static struct pci_driver nes_pci_driver .remove = nes_remove, }; @@ -86,7 +86,7 @@ { unsigned int devfn = 0xffffffff; unsigned char bus_number = 0xff; -@@ -837,7 +837,7 @@ static ssize_t nes_show_adapter(struct d +@@ -860,7 +860,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; -@@ -846,7 +846,7 @@ static ssize_t nes_store_adapter(struct +@@ -869,7 +869,7 @@ static ssize_t nes_store_adapter(struct return strnlen(buf, count); } @@ -104,7 +104,7 @@ { u32 eeprom_cmd = 0xdead; u32 i = 0; -@@ -862,7 +862,7 @@ static ssize_t nes_show_ee_cmd(struct de +@@ -885,7 +885,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; -@@ -883,7 +883,7 @@ static ssize_t nes_store_ee_cmd(struct d +@@ -906,7 +906,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; -@@ -900,7 +900,7 @@ static ssize_t nes_show_ee_data(struct d +@@ -923,7 +923,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; -@@ -921,7 +921,7 @@ static ssize_t nes_store_ee_data(struct +@@ -944,7 +944,7 @@ static ssize_t nes_store_ee_data(struct return strnlen(buf, count); } @@ -140,7 +140,7 @@ { u32 flash_cmd = 0xdead; u32 i = 0; -@@ -938,7 +938,7 @@ static ssize_t nes_show_flash_cmd(struct +@@ -961,7 +961,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; -@@ -959,7 +959,7 @@ static ssize_t nes_store_flash_cmd(struc +@@ -982,7 +982,7 @@ static ssize_t nes_store_flash_cmd(struc return strnlen(buf, count); } @@ -158,7 +158,7 @@ { u32 flash_data = 0xdead; u32 i = 0; -@@ -976,7 +976,7 @@ static ssize_t nes_show_flash_data(struc +@@ -999,7 +999,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; -@@ -997,12 +997,12 @@ static ssize_t nes_store_flash_data(stru +@@ -1020,12 +1020,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; -@@ -1013,7 +1013,7 @@ static ssize_t nes_store_nonidx_addr(str +@@ -1036,7 +1036,7 @@ static ssize_t nes_store_nonidx_addr(str return strnlen(buf, count); } @@ -191,7 +191,7 @@ { u32 nonidx_data = 0xdead; u32 i = 0; -@@ -1030,7 +1030,7 @@ static ssize_t nes_show_nonidx_data(stru +@@ -1053,7 +1053,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; -@@ -1051,12 +1051,12 @@ static ssize_t nes_store_nonidx_data(str +@@ -1074,12 +1074,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; -@@ -1067,7 +1067,7 @@ static ssize_t nes_store_idx_addr(struct +@@ -1090,7 +1090,7 @@ static ssize_t nes_store_idx_addr(struct return strnlen(buf, count); } @@ -224,7 +224,7 @@ { u32 idx_data = 0xdead; u32 i = 0; -@@ -1084,7 +1084,7 @@ static ssize_t nes_show_idx_data(struct +@@ -1107,7 +1107,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; -@@ -1105,11 +1105,7 @@ static ssize_t nes_store_idx_data(struct +@@ -1128,11 +1128,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; -@@ -1126,12 +1122,8 @@ static ssize_t nes_show_wqm_quanta(struc +@@ -1149,12 +1145,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; -@@ -1156,26 +1148,16 @@ static ssize_t nes_store_wqm_quanta(stru +@@ -1179,26 +1171,16 @@ static ssize_t nes_store_wqm_quanta(stru return strnlen(buf, count); } @@ -300,16 +300,16 @@ { --- a/drivers/pci/pci-driver.c +++ b/drivers/pci/pci-driver.c -@@ -99,7 +99,7 @@ static void pci_free_dynids(struct pci_d +@@ -96,7 +96,7 @@ static void pci_free_dynids(struct pci_d + * * Allow PCI IDs to be added to an existing driver via sysfs. */ - static ssize_t --store_new_id(struct device_driver *driver, const char *buf, size_t count) -+new_id_store(struct device_driver *driver, const char *buf, size_t count) +-static ssize_t store_new_id(struct device_driver *driver, const char *buf, ++static ssize_t new_id_store(struct device_driver *driver, const char *buf, + size_t count) { struct pci_driver *pdrv = to_pci_driver(driver); - const struct pci_device_id *ids = pdrv->id_table; -@@ -136,7 +136,7 @@ store_new_id(struct device_driver *drive +@@ -154,7 +154,7 @@ static ssize_t store_new_id(struct devic return retval; return count; } @@ -318,16 +318,16 @@ /** * store_remove_id - remove a PCI device ID from this driver -@@ -147,7 +147,7 @@ static DRIVER_ATTR(new_id, S_IWUSR, NULL +@@ -164,7 +164,7 @@ static DRIVER_ATTR(new_id, S_IWUSR, NULL + * * Removes a dynamic pci device ID to this driver. */ - static ssize_t --store_remove_id(struct device_driver *driver, const char *buf, size_t count) -+remove_id_store(struct device_driver *driver, const char *buf, size_t count) +-static ssize_t store_remove_id(struct device_driver *driver, const char *buf, ++static ssize_t remove_id_store(struct device_driver *driver, const char *buf, + size_t count) { struct pci_dynid *dynid, *n; - struct pci_driver *pdrv = to_pci_driver(driver); -@@ -182,7 +182,7 @@ store_remove_id(struct device_driver *dr +@@ -200,7 +200,7 @@ static ssize_t store_remove_id(struct de return retval; return count; } @@ -354,7 +354,7 @@ { --- a/drivers/scsi/megaraid/megaraid_sas_base.c +++ b/drivers/scsi/megaraid/megaraid_sas_base.c -@@ -5905,50 +5905,43 @@ static struct pci_driver megasas_pci_dri +@@ -6391,50 +6391,43 @@ static struct pci_driver megasas_pci_dri /* * Sysfs driver attributes */ @@ -416,7 +416,7 @@ { int retval = count; if(sscanf(buf,"%u",&megasas_dbg_lvl)<1){ -@@ -5958,8 +5951,7 @@ megasas_sysfs_set_dbg_lvl(struct device_ +@@ -6444,8 +6437,7 @@ megasas_sysfs_set_dbg_lvl(struct device_ return retval; } @@ -470,7 +470,7 @@ }, }; -@@ -4308,14 +4307,8 @@ static int __init init_st(void) +@@ -4327,14 +4326,8 @@ static int __init init_st(void) if (err) goto err_chrdev; @@ -485,7 +485,7 @@ err_chrdev: unregister_chrdev_region(MKDEV(SCSI_TAPE_MAJOR, 0), ST_MAX_TAPE_ENTRIES); -@@ -4326,7 +4319,6 @@ err_class: +@@ -4345,7 +4338,6 @@ err_class: static void __exit exit_st(void) { @@ -493,7 +493,7 @@ scsi_unregister_driver(&st_template.gendrv); unregister_chrdev_region(MKDEV(SCSI_TAPE_MAJOR, 0), ST_MAX_TAPE_ENTRIES); -@@ -4339,68 +4331,38 @@ module_exit(exit_st); +@@ -4358,68 +4350,38 @@ module_exit(exit_st); /* The sysfs driver interface. Read-only at the moment */ |