Commit 0478b83adb0269033221dc063d1185a224681ee8
Committed by
Greg Kroah-Hartman
Greg Kroah-Hartman
1 parent
5b88feb134
Exists in
master
and in
7 other branches
zfcp: Use device_driver default attribute groups.
CC: Swen Schillig <swen@vnet.ibm.com> Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Showing 3 changed files with 9 additions and 35 deletions Side-by-side Diff
drivers/s390/scsi/zfcp_ccw.c
| ... | ... | @@ -52,6 +52,9 @@ |
| 52 | 52 | .set_offline = zfcp_ccw_set_offline, |
| 53 | 53 | .notify = zfcp_ccw_notify, |
| 54 | 54 | .shutdown = zfcp_ccw_shutdown, |
| 55 | + .driver = { | |
| 56 | + .groups = zfcp_driver_attr_groups, | |
| 57 | + }, | |
| 55 | 58 | }; |
| 56 | 59 | |
| 57 | 60 | MODULE_DEVICE_TABLE(ccw, zfcp_ccw_device_id); |
| ... | ... | @@ -251,16 +254,7 @@ |
| 251 | 254 | int __init |
| 252 | 255 | zfcp_ccw_register(void) |
| 253 | 256 | { |
| 254 | - int retval; | |
| 255 | - | |
| 256 | - retval = ccw_driver_register(&zfcp_ccw_driver); | |
| 257 | - if (retval) | |
| 258 | - goto out; | |
| 259 | - retval = zfcp_sysfs_driver_create_files(&zfcp_ccw_driver.driver); | |
| 260 | - if (retval) | |
| 261 | - ccw_driver_unregister(&zfcp_ccw_driver); | |
| 262 | - out: | |
| 263 | - return retval; | |
| 257 | + return ccw_driver_register(&zfcp_ccw_driver); | |
| 264 | 258 | } |
| 265 | 259 | |
| 266 | 260 | /** |
drivers/s390/scsi/zfcp_ext.h
| ... | ... | @@ -27,8 +27,7 @@ |
| 27 | 27 | extern struct zfcp_data zfcp_data; |
| 28 | 28 | |
| 29 | 29 | /******************************** SYSFS *************************************/ |
| 30 | -extern int zfcp_sysfs_driver_create_files(struct device_driver *); | |
| 31 | -extern void zfcp_sysfs_driver_remove_files(struct device_driver *); | |
| 30 | +extern struct attribute_group *zfcp_driver_attr_groups[]; | |
| 32 | 31 | extern int zfcp_sysfs_adapter_create_files(struct device *); |
| 33 | 32 | extern void zfcp_sysfs_adapter_remove_files(struct device *); |
| 34 | 33 | extern int zfcp_sysfs_port_create_files(struct device *, u32); |
drivers/s390/scsi/zfcp_sysfs_driver.c
| ... | ... | @@ -98,29 +98,10 @@ |
| 98 | 98 | .attrs = zfcp_driver_attrs, |
| 99 | 99 | }; |
| 100 | 100 | |
| 101 | -/** | |
| 102 | - * zfcp_sysfs_create_driver_files - create sysfs driver files | |
| 103 | - * @dev: pointer to belonging device | |
| 104 | - * | |
| 105 | - * Create all sysfs attributes of the zfcp device driver | |
| 106 | - */ | |
| 107 | -int | |
| 108 | -zfcp_sysfs_driver_create_files(struct device_driver *drv) | |
| 109 | -{ | |
| 110 | - return sysfs_create_group(&drv->kobj, &zfcp_driver_attr_group); | |
| 111 | -} | |
| 112 | - | |
| 113 | -/** | |
| 114 | - * zfcp_sysfs_remove_driver_files - remove sysfs driver files | |
| 115 | - * @dev: pointer to belonging device | |
| 116 | - * | |
| 117 | - * Remove all sysfs attributes of the zfcp device driver | |
| 118 | - */ | |
| 119 | -void | |
| 120 | -zfcp_sysfs_driver_remove_files(struct device_driver *drv) | |
| 121 | -{ | |
| 122 | - sysfs_remove_group(&drv->kobj, &zfcp_driver_attr_group); | |
| 123 | -} | |
| 101 | +struct attribute_group *zfcp_driver_attr_groups[] = { | |
| 102 | + &zfcp_driver_attr_group, | |
| 103 | + NULL, | |
| 104 | +}; | |
| 124 | 105 | |
| 125 | 106 | #undef ZFCP_LOG_AREA |