diff options
| -rw-r--r-- | d01.patch | 554 | ||||
| -rw-r--r-- | d02.patch | 227 | ||||
| -rw-r--r-- | d03.patch | 42 | ||||
| -rw-r--r-- | d04.patch | 32 | ||||
| -rw-r--r-- | d05.patch | 113 | ||||
| -rw-r--r-- | qlcnic_sysfs.patch | 20 | ||||
| -rw-r--r-- | series | 22 |
7 files changed, 439 insertions, 571 deletions
diff --git a/d01.patch b/d01.patch index 395a7ff46da241..804b67195038c2 100644 --- a/d01.patch +++ b/d01.patch @@ -1,17 +1,10 @@ --- - drivers/hid/hid-core.c | 24 +++------ - drivers/infiniband/hw/nes/nes.c | 80 +++++++++++------------------- - drivers/pci/pci-driver.c | 8 +-- - drivers/scsi/aic94xx/aic94xx_init.c | 4 - - drivers/scsi/megaraid/megaraid_sas_base.c | 32 ++++-------- - drivers/scsi/osst.c | 4 - - drivers/scsi/st.c | 74 ++++++--------------------- - drivers/tty/hvc/hvcs.c | 7 +- - 8 files changed, 82 insertions(+), 151 deletions(-) + drivers/hid/hid-core.c | 24 ++++++++++-------------- + 1 file changed, 10 insertions(+), 14 deletions(-) --- a/drivers/hid/hid-core.c +++ b/drivers/hid/hid-core.c -@@ -1986,7 +1986,7 @@ struct hid_dynid { +@@ -2133,7 +2133,7 @@ struct hid_dynid { * Adds a new dynamic hid device ID to this driver, * and causes the driver to probe for all devices again. */ @@ -19,8 +12,8 @@ +static ssize_t new_id_store(struct device_driver *drv, const char *buf, size_t count) { - struct hid_driver *hdrv = container_of(drv, struct hid_driver, driver); -@@ -2018,7 +2018,13 @@ static ssize_t store_new_id(struct devic + struct hid_driver *hdrv = to_hid_driver(drv); +@@ -2165,7 +2165,13 @@ static ssize_t store_new_id(struct devic return ret ? : count; } @@ -35,7 +28,7 @@ static void hid_free_dynids(struct hid_driver *hdrv) { -@@ -2178,6 +2184,7 @@ static int hid_uevent(struct device *dev +@@ -2329,6 +2335,7 @@ static int hid_uevent(struct device *dev static struct bus_type hid_bus_type = { .name = "hid", .dev_groups = hid_dev_groups, @@ -43,7 +36,7 @@ .match = hid_bus_match, .probe = hid_device_probe, .remove = hid_device_remove, -@@ -2625,8 +2632,6 @@ EXPORT_SYMBOL_GPL(hid_destroy_device); +@@ -2767,8 +2774,6 @@ EXPORT_SYMBOL_GPL(hid_destroy_device); int __hid_register_driver(struct hid_driver *hdrv, struct module *owner, const char *mod_name) { @@ -52,7 +45,7 @@ hdrv->driver.name = hdrv->name; hdrv->driver.bus = &hid_bus_type; hdrv->driver.owner = owner; -@@ -2635,21 +2640,12 @@ int __hid_register_driver(struct hid_dri +@@ -2777,21 +2782,12 @@ int __hid_register_driver(struct hid_dri INIT_LIST_HEAD(&hdrv->dyn_list); spin_lock_init(&hdrv->dyn_lock); @@ -75,534 +68,3 @@ driver_unregister(&hdrv->driver); hid_free_dynids(hdrv); } ---- a/drivers/infiniband/hw/nes/nes.c -+++ b/drivers/infiniband/hw/nes/nes.c -@@ -841,7 +841,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; -@@ -860,7 +860,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; -@@ -869,7 +869,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; -@@ -885,7 +885,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; -@@ -906,7 +906,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; -@@ -923,7 +923,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; -@@ -944,7 +944,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; -@@ -961,7 +961,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; -@@ -982,7 +982,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; -@@ -999,7 +999,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; -@@ -1020,12 +1020,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; -@@ -1036,7 +1036,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; -@@ -1053,7 +1053,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; -@@ -1074,12 +1074,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; -@@ -1090,7 +1090,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; -@@ -1107,7 +1107,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; -@@ -1128,11 +1128,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; -@@ -1149,12 +1145,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; -@@ -1179,26 +1171,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) - { ---- a/drivers/pci/pci-driver.c -+++ b/drivers/pci/pci-driver.c -@@ -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, -+static ssize_t new_id_store(struct device_driver *driver, const char *buf, - size_t count) - { - struct pci_driver *pdrv = to_pci_driver(driver); -@@ -154,7 +154,7 @@ static ssize_t store_new_id(struct devic - return retval; - return count; - } --static DRIVER_ATTR(new_id, S_IWUSR, NULL, store_new_id); -+static DRIVER_ATTR_WO(new_id); - - /** - * store_remove_id - remove a PCI device ID from this driver -@@ -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, -+static ssize_t remove_id_store(struct device_driver *driver, const char *buf, - size_t count) - { - struct pci_dynid *dynid, *n; -@@ -200,7 +200,7 @@ static ssize_t store_remove_id(struct de - return retval; - return count; - } --static DRIVER_ATTR(remove_id, S_IWUSR, NULL, store_remove_id); -+static DRIVER_ATTR_WO(remove_id); - - static struct attribute *pci_drv_attrs[] = { - &driver_attr_new_id.attr, ---- a/drivers/scsi/aic94xx/aic94xx_init.c -+++ b/drivers/scsi/aic94xx/aic94xx_init.c -@@ -973,11 +973,11 @@ static int asd_scan_finished(struct Scsi - return 1; - } - --static ssize_t asd_version_show(struct device_driver *driver, char *buf) -+static ssize_t version_show(struct device_driver *driver, char *buf) - { - return snprintf(buf, PAGE_SIZE, "%s\n", ASD_DRIVER_VERSION); - } --static DRIVER_ATTR(version, S_IRUGO, asd_version_show, NULL); -+static DRIVER_ATTR_RO(version); - - static int asd_create_driver_attrs(struct device_driver *driver) - { ---- a/drivers/scsi/megaraid/megaraid_sas_base.c -+++ b/drivers/scsi/megaraid/megaraid_sas_base.c -@@ -6391,50 +6391,43 @@ static struct pci_driver megasas_pci_dri - /* - * Sysfs driver attributes - */ --static ssize_t megasas_sysfs_show_version(struct device_driver *dd, char *buf) -+static ssize_t version_show(struct device_driver *dd, char *buf) - { - return snprintf(buf, strlen(MEGASAS_VERSION) + 2, "%s\n", - MEGASAS_VERSION); - } - --static DRIVER_ATTR(version, S_IRUGO, megasas_sysfs_show_version, NULL); -+static DRIVER_ATTR_RO(version); - --static ssize_t --megasas_sysfs_show_release_date(struct device_driver *dd, char *buf) -+static ssize_t release_date_show(struct device_driver *dd, char *buf) - { - return snprintf(buf, strlen(MEGASAS_RELDATE) + 2, "%s\n", - MEGASAS_RELDATE); - } - --static DRIVER_ATTR(release_date, S_IRUGO, megasas_sysfs_show_release_date, -- NULL); -+static DRIVER_ATTR_RO(release_date); - --static ssize_t --megasas_sysfs_show_support_poll_for_event(struct device_driver *dd, char *buf) -+static ssize_t support_poll_for_event_show(struct device_driver *dd, char *buf) - { - return sprintf(buf, "%u\n", support_poll_for_event); - } - --static DRIVER_ATTR(support_poll_for_event, S_IRUGO, -- megasas_sysfs_show_support_poll_for_event, NULL); -+static DRIVER_ATTR_RO(support_poll_for_event); - -- static ssize_t --megasas_sysfs_show_support_device_change(struct device_driver *dd, char *buf) -+static ssize_t support_device_change_show(struct device_driver *dd, char *buf) - { - return sprintf(buf, "%u\n", support_device_change); - } - --static DRIVER_ATTR(support_device_change, S_IRUGO, -- megasas_sysfs_show_support_device_change, NULL); -+static DRIVER_ATTR_RO(support_device_change); - --static ssize_t --megasas_sysfs_show_dbg_lvl(struct device_driver *dd, char *buf) -+static ssize_t dbg_lvl_show(struct device_driver *dd, char *buf) - { - return sprintf(buf, "%u\n", megasas_dbg_lvl); - } - --static ssize_t --megasas_sysfs_set_dbg_lvl(struct device_driver *dd, const char *buf, size_t count) -+static ssize_t dbg_lvl_store(struct device_driver *dd, const char *buf, -+ size_t count) - { - int retval = count; - if(sscanf(buf,"%u",&megasas_dbg_lvl)<1){ -@@ -6444,8 +6437,7 @@ megasas_sysfs_set_dbg_lvl(struct device_ - return retval; - } - --static DRIVER_ATTR(dbg_lvl, S_IRUGO|S_IWUSR, megasas_sysfs_show_dbg_lvl, -- megasas_sysfs_set_dbg_lvl); -+static DRIVER_ATTR_RW(dbg_lvl); - - static void - megasas_aen_polling(struct work_struct *work) ---- a/drivers/scsi/osst.c -+++ b/drivers/scsi/osst.c -@@ -5663,12 +5663,12 @@ static struct osst_support_data support_ - * sysfs support for osst driver parameter information - */ - --static ssize_t osst_version_show(struct device_driver *ddd, char *buf) -+static ssize_t version_show(struct device_driver *ddd, char *buf) - { - return snprintf(buf, PAGE_SIZE, "%s\n", osst_version); - } - --static DRIVER_ATTR(version, S_IRUGO, osst_version_show, NULL); -+static DRIVER_ATTR_RO(version); - - static int osst_create_sysfs_files(struct device_driver *sysfs) - { ---- a/drivers/scsi/st.c -+++ b/drivers/scsi/st.c -@@ -83,6 +83,7 @@ static int try_wdio = 1; - - static struct class st_sysfs_class; - static const struct attribute_group *st_dev_groups[]; -+static const struct attribute_group *st_drv_groups[]; - - MODULE_AUTHOR("Kai Makisara"); - MODULE_DESCRIPTION("SCSI tape (st) driver"); -@@ -190,15 +191,13 @@ static int sgl_unmap_user_pages(struct s - static int st_probe(struct device *); - static int st_remove(struct device *); - --static int do_create_sysfs_files(void); --static void do_remove_sysfs_files(void); -- - static struct scsi_driver st_template = { - .owner = THIS_MODULE, - .gendrv = { - .name = "st", - .probe = st_probe, - .remove = st_remove, -+ .groups = st_drv_groups, - }, - }; - -@@ -4327,14 +4326,8 @@ static int __init init_st(void) - if (err) - goto err_chrdev; - -- err = do_create_sysfs_files(); -- if (err) -- goto err_scsidrv; -- - return 0; - --err_scsidrv: -- scsi_unregister_driver(&st_template.gendrv); - err_chrdev: - unregister_chrdev_region(MKDEV(SCSI_TAPE_MAJOR, 0), - ST_MAX_TAPE_ENTRIES); -@@ -4345,7 +4338,6 @@ err_class: - - static void __exit exit_st(void) - { -- do_remove_sysfs_files(); - scsi_unregister_driver(&st_template.gendrv); - unregister_chrdev_region(MKDEV(SCSI_TAPE_MAJOR, 0), - ST_MAX_TAPE_ENTRIES); -@@ -4358,68 +4350,38 @@ module_exit(exit_st); - - - /* The sysfs driver interface. Read-only at the moment */ --static ssize_t st_try_direct_io_show(struct device_driver *ddp, char *buf) -+static ssize_t try_direct_io_show(struct device_driver *ddp, char *buf) - { - return snprintf(buf, PAGE_SIZE, "%d\n", try_direct_io); - } --static DRIVER_ATTR(try_direct_io, S_IRUGO, st_try_direct_io_show, NULL); -+static DRIVER_ATTR_RO(try_direct_io); - --static ssize_t st_fixed_buffer_size_show(struct device_driver *ddp, char *buf) -+static ssize_t fixed_buffer_size_show(struct device_driver *ddp, char *buf) - { - return snprintf(buf, PAGE_SIZE, "%d\n", st_fixed_buffer_size); - } --static DRIVER_ATTR(fixed_buffer_size, S_IRUGO, st_fixed_buffer_size_show, NULL); -+static DRIVER_ATTR_RO(fixed_buffer_size); - --static ssize_t st_max_sg_segs_show(struct device_driver *ddp, char *buf) -+static ssize_t max_sg_segs_show(struct device_driver *ddp, char *buf) - { - return snprintf(buf, PAGE_SIZE, "%d\n", st_max_sg_segs); - } --static DRIVER_ATTR(max_sg_segs, S_IRUGO, st_max_sg_segs_show, NULL); -+static DRIVER_ATTR_RO(max_sg_segs); - --static ssize_t st_version_show(struct device_driver *ddd, char *buf) -+static ssize_t version_show(struct device_driver *ddd, char *buf) - { - return snprintf(buf, PAGE_SIZE, "[%s]\n", verstr); - } --static DRIVER_ATTR(version, S_IRUGO, st_version_show, NULL); -- --static int do_create_sysfs_files(void) --{ -- struct device_driver *sysfs = &st_template.gendrv; -- int err; -- -- err = driver_create_file(sysfs, &driver_attr_try_direct_io); -- if (err) -- return err; -- err = driver_create_file(sysfs, &driver_attr_fixed_buffer_size); -- if (err) -- goto err_try_direct_io; -- err = driver_create_file(sysfs, &driver_attr_max_sg_segs); -- if (err) -- goto err_attr_fixed_buf; -- err = driver_create_file(sysfs, &driver_attr_version); -- if (err) -- goto err_attr_max_sg; -- -- return 0; -- --err_attr_max_sg: -- driver_remove_file(sysfs, &driver_attr_max_sg_segs); --err_attr_fixed_buf: -- driver_remove_file(sysfs, &driver_attr_fixed_buffer_size); --err_try_direct_io: -- driver_remove_file(sysfs, &driver_attr_try_direct_io); -- return err; --} -- --static void do_remove_sysfs_files(void) --{ -- struct device_driver *sysfs = &st_template.gendrv; -+static DRIVER_ATTR_RO(version); - -- driver_remove_file(sysfs, &driver_attr_version); -- driver_remove_file(sysfs, &driver_attr_max_sg_segs); -- driver_remove_file(sysfs, &driver_attr_fixed_buffer_size); -- driver_remove_file(sysfs, &driver_attr_try_direct_io); --} -+static struct attribute *st_drv_attrs[] = { -+ &driver_attr_try_direct_io.attr, -+ &driver_attr_fixed_buffer_size.attr, -+ &driver_attr_max_sg_segs.attr, -+ &driver_attr_version.attr, -+ NULL, -+}; -+ATTRIBUTE_GROUPS(st_drv); - - /* The sysfs simple class interface */ - static ssize_t ---- a/drivers/tty/hvc/hvcs.c -+++ b/drivers/tty/hvc/hvcs.c -@@ -484,13 +484,13 @@ static struct attribute_group hvcs_attr_ - .attrs = hvcs_attrs, - }; - --static ssize_t hvcs_rescan_show(struct device_driver *ddp, char *buf) -+static ssize_t rescan_show(struct device_driver *ddp, char *buf) - { - /* A 1 means it is updating, a 0 means it is done updating */ - return snprintf(buf, PAGE_SIZE, "%d\n", hvcs_rescan_status); - } - --static ssize_t hvcs_rescan_store(struct device_driver *ddp, const char * buf, -+static ssize_t rescan_store(struct device_driver *ddp, const char * buf, - size_t count) - { - if ((simple_strtol(buf, NULL, 0) != 1) -@@ -505,8 +505,7 @@ static ssize_t hvcs_rescan_store(struct - return count; - } - --static DRIVER_ATTR(rescan, -- S_IRUGO | S_IWUSR, hvcs_rescan_show, hvcs_rescan_store); -+static DRIVER_ATTR_RW(rescan); - - static void hvcs_kick(void) - { 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) + { diff --git a/d03.patch b/d03.patch new file mode 100644 index 00000000000000..884f2fa3b2dad3 --- /dev/null +++ b/d03.patch @@ -0,0 +1,42 @@ +--- + drivers/pci/pci-driver.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +--- a/drivers/pci/pci-driver.c ++++ b/drivers/pci/pci-driver.c +@@ -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, ++static ssize_t new_id_store(struct device_driver *driver, const char *buf, + size_t count) + { + struct pci_driver *pdrv = to_pci_driver(driver); +@@ -154,7 +154,7 @@ static ssize_t store_new_id(struct devic + return retval; + return count; + } +-static DRIVER_ATTR(new_id, S_IWUSR, NULL, store_new_id); ++static DRIVER_ATTR_WO(new_id); + + /** + * store_remove_id - remove a PCI device ID from this driver +@@ -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, ++static ssize_t remove_id_store(struct device_driver *driver, const char *buf, + size_t count) + { + struct pci_dynid *dynid, *n; +@@ -198,7 +198,7 @@ static ssize_t store_remove_id(struct de + + return retval; + } +-static DRIVER_ATTR(remove_id, S_IWUSR, NULL, store_remove_id); ++static DRIVER_ATTR_WO(remove_id); + + static struct attribute *pci_drv_attrs[] = { + &driver_attr_new_id.attr, diff --git a/d04.patch b/d04.patch new file mode 100644 index 00000000000000..a55e2d82f0c3f6 --- /dev/null +++ b/d04.patch @@ -0,0 +1,32 @@ +--- + drivers/tty/hvc/hvcs.c | 7 +++---- + 1 file changed, 3 insertions(+), 4 deletions(-) + +--- a/drivers/tty/hvc/hvcs.c ++++ b/drivers/tty/hvc/hvcs.c +@@ -484,13 +484,13 @@ static struct attribute_group hvcs_attr_ + .attrs = hvcs_attrs, + }; + +-static ssize_t hvcs_rescan_show(struct device_driver *ddp, char *buf) ++static ssize_t rescan_show(struct device_driver *ddp, char *buf) + { + /* A 1 means it is updating, a 0 means it is done updating */ + return snprintf(buf, PAGE_SIZE, "%d\n", hvcs_rescan_status); + } + +-static ssize_t hvcs_rescan_store(struct device_driver *ddp, const char * buf, ++static ssize_t rescan_store(struct device_driver *ddp, const char * buf, + size_t count) + { + if ((simple_strtol(buf, NULL, 0) != 1) +@@ -505,8 +505,7 @@ static ssize_t hvcs_rescan_store(struct + return count; + } + +-static DRIVER_ATTR(rescan, +- S_IRUGO | S_IWUSR, hvcs_rescan_show, hvcs_rescan_store); ++static DRIVER_ATTR_RW(rescan); + + static void hvcs_kick(void) + { diff --git a/d05.patch b/d05.patch new file mode 100644 index 00000000000000..ced6a40f0ad593 --- /dev/null +++ b/d05.patch @@ -0,0 +1,113 @@ +--- + drivers/scsi/aic94xx/aic94xx_init.c | 4 +-- + drivers/scsi/megaraid/megaraid_sas_base.c | 36 ++++++++++-------------------- + drivers/scsi/osst.c | 4 +-- + 3 files changed, 16 insertions(+), 28 deletions(-) + +--- a/drivers/scsi/aic94xx/aic94xx_init.c ++++ b/drivers/scsi/aic94xx/aic94xx_init.c +@@ -957,11 +957,11 @@ static int asd_scan_finished(struct Scsi + return 1; + } + +-static ssize_t asd_version_show(struct device_driver *driver, char *buf) ++static ssize_t version_show(struct device_driver *driver, char *buf) + { + return snprintf(buf, PAGE_SIZE, "%s\n", ASD_DRIVER_VERSION); + } +-static DRIVER_ATTR(version, S_IRUGO, asd_version_show, NULL); ++static DRIVER_ATTR_RO(version); + + static int asd_create_driver_attrs(struct device_driver *driver) + { +--- a/drivers/scsi/megaraid/megaraid_sas_base.c ++++ b/drivers/scsi/megaraid/megaraid_sas_base.c +@@ -6961,49 +6961,39 @@ static struct pci_driver megasas_pci_dri + /* + * Sysfs driver attributes + */ +-static ssize_t megasas_sysfs_show_version(struct device_driver *dd, char *buf) ++static ssize_t version_show(struct device_driver *dd, char *buf) + { + return snprintf(buf, strlen(MEGASAS_VERSION) + 2, "%s\n", + MEGASAS_VERSION); + } ++static DRIVER_ATTR_RO(version); + +-static DRIVER_ATTR(version, S_IRUGO, megasas_sysfs_show_version, NULL); +- +-static ssize_t +-megasas_sysfs_show_release_date(struct device_driver *dd, char *buf) ++static ssize_t release_date_show(struct device_driver *dd, char *buf) + { + return snprintf(buf, strlen(MEGASAS_RELDATE) + 2, "%s\n", + MEGASAS_RELDATE); + } ++static DRIVER_ATTR_RO(release_date); + +-static DRIVER_ATTR(release_date, S_IRUGO, megasas_sysfs_show_release_date, NULL); +- +-static ssize_t +-megasas_sysfs_show_support_poll_for_event(struct device_driver *dd, char *buf) ++static ssize_t support_poll_for_event_show(struct device_driver *dd, char *buf) + { + return sprintf(buf, "%u\n", support_poll_for_event); + } ++static DRIVER_ATTR_RO(support_poll_for_event); + +-static DRIVER_ATTR(support_poll_for_event, S_IRUGO, +- megasas_sysfs_show_support_poll_for_event, NULL); +- +- static ssize_t +-megasas_sysfs_show_support_device_change(struct device_driver *dd, char *buf) ++static ssize_t support_device_change_show(struct device_driver *dd, char *buf) + { + return sprintf(buf, "%u\n", support_device_change); + } ++static DRIVER_ATTR_RO(support_device_change); + +-static DRIVER_ATTR(support_device_change, S_IRUGO, +- megasas_sysfs_show_support_device_change, NULL); +- +-static ssize_t +-megasas_sysfs_show_dbg_lvl(struct device_driver *dd, char *buf) ++static ssize_t dbg_lvl_show(struct device_driver *dd, char *buf) + { + return sprintf(buf, "%u\n", megasas_dbg_lvl); + } + +-static ssize_t +-megasas_sysfs_set_dbg_lvl(struct device_driver *dd, const char *buf, size_t count) ++static ssize_t dbg_lvl_store(struct device_driver *dd, const char *buf, ++ size_t count) + { + int retval = count; + +@@ -7013,9 +7003,7 @@ megasas_sysfs_set_dbg_lvl(struct device_ + } + return retval; + } +- +-static DRIVER_ATTR(dbg_lvl, S_IRUGO|S_IWUSR, megasas_sysfs_show_dbg_lvl, +- megasas_sysfs_set_dbg_lvl); ++static DRIVER_ATTR_RW(dbg_lvl); + + static void + megasas_aen_polling(struct work_struct *work) +--- a/drivers/scsi/osst.c ++++ b/drivers/scsi/osst.c +@@ -5664,12 +5664,12 @@ static struct osst_support_data support_ + * sysfs support for osst driver parameter information + */ + +-static ssize_t osst_version_show(struct device_driver *ddd, char *buf) ++static ssize_t version_show(struct device_driver *ddd, char *buf) + { + return snprintf(buf, PAGE_SIZE, "%s\n", osst_version); + } + +-static DRIVER_ATTR(version, S_IRUGO, osst_version_show, NULL); ++static DRIVER_ATTR_RO(version); + + static int osst_create_sysfs_files(struct device_driver *sysfs) + { diff --git a/qlcnic_sysfs.patch b/qlcnic_sysfs.patch index 5d5f0529852f71..608c30181bb8da 100644 --- a/qlcnic_sysfs.patch +++ b/qlcnic_sysfs.patch @@ -4,7 +4,7 @@ --- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_sysfs.c +++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_sysfs.c -@@ -36,9 +36,9 @@ int qlcnicvf_config_led(struct qlcnic_ad +@@ -33,9 +33,9 @@ int qlcnicvf_config_led(struct qlcnic_ad return -EOPNOTSUPP; } @@ -17,7 +17,7 @@ { struct qlcnic_adapter *adapter = dev_get_drvdata(dev); unsigned long new; -@@ -60,9 +60,8 @@ err_out: +@@ -57,9 +57,8 @@ err_out: return ret; } @@ -29,7 +29,7 @@ { struct qlcnic_adapter *adapter = dev_get_drvdata(dev); int bridged_mode = 0; -@@ -72,10 +71,11 @@ static ssize_t qlcnic_show_bridged_mode( +@@ -69,10 +68,11 @@ static ssize_t qlcnic_show_bridged_mode( return sprintf(buf, "%d\n", bridged_mode); } @@ -44,7 +44,7 @@ { struct qlcnic_adapter *adapter = dev_get_drvdata(dev); unsigned long new; -@@ -89,12 +89,13 @@ static ssize_t qlcnic_store_diag_mode(st +@@ -86,12 +86,13 @@ static ssize_t qlcnic_store_diag_mode(st return len; } @@ -60,7 +60,7 @@ static int qlcnic_validate_beacon(struct qlcnic_adapter *adapter, u16 beacon, u8 *state, u8 *rate) -@@ -215,9 +216,8 @@ out: +@@ -212,9 +213,8 @@ out: return err; } @@ -72,7 +72,7 @@ { struct qlcnic_adapter *adapter = dev_get_drvdata(dev); int err = 0; -@@ -238,8 +238,8 @@ static ssize_t qlcnic_store_beacon(struc +@@ -235,8 +235,8 @@ static ssize_t qlcnic_store_beacon(struc return err; } @@ -83,7 +83,7 @@ { struct qlcnic_adapter *adapter = dev_get_drvdata(dev); -@@ -267,6 +267,7 @@ static int qlcnic_sysfs_validate_crb(str +@@ -264,6 +264,7 @@ static int qlcnic_sysfs_validate_crb(str return 0; } @@ -91,7 +91,7 @@ static ssize_t qlcnic_sysfs_read_crb(struct file *filp, struct kobject *kobj, struct bin_attribute *attr, char *buf, -@@ -1182,24 +1183,6 @@ static ssize_t qlcnic_83xx_sysfs_flash_w +@@ -1174,24 +1175,6 @@ static ssize_t qlcnic_83xx_sysfs_flash_w return size; } @@ -116,7 +116,7 @@ static struct bin_attribute bin_attr_crb = { .attr = {.name = "crb", .mode = (S_IRUGO | S_IWUSR)}, .size = 0, -@@ -1325,6 +1308,24 @@ void qlcnic_unregister_hwmon_dev(struct +@@ -1317,6 +1300,24 @@ void qlcnic_unregister_hwmon_dev(struct } #endif @@ -141,7 +141,7 @@ void qlcnic_create_sysfs_entries(struct qlcnic_adapter *adapter) { struct device *dev = &adapter->pdev->dev; -@@ -1338,6 +1339,11 @@ void qlcnic_create_sysfs_entries(struct +@@ -1330,6 +1331,11 @@ void qlcnic_create_sysfs_entries(struct void qlcnic_remove_sysfs_entries(struct qlcnic_adapter *adapter) { struct device *dev = &adapter->pdev->dev; @@ -69,19 +69,11 @@ c10.patch c99.patch # -#qlcnic_sysfs.patch -# -#d01.patch -# -# -# -# -# -# -# -# -# -# -# -# +d01.patch +d02.patch +d03.patch +d04.patch +d05.patch +qlcnic_sysfs.patch +# |