diff options
| author | Sebastian Ott <sebott@linux.vnet.ibm.com> | 2012-05-15 18:05:46 +0200 |
|---|---|---|
| committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2012-05-16 14:42:49 +0200 |
| commit | 9d2aa0aa8fc8b78a09145cf8e9920307e01aa0c7 (patch) | |
| tree | c2612178b0d3a4f5536ac698d5d8a55a5eeb56aa | |
| parent | 330ce1b082072ab0c6cc4a9566205ead6534bd56 (diff) | |
| download | linux-3.10-9d2aa0aa8fc8b78a09145cf8e9920307e01aa0c7.tar.gz linux-3.10-9d2aa0aa8fc8b78a09145cf8e9920307e01aa0c7.tar.bz2 linux-3.10-9d2aa0aa8fc8b78a09145cf8e9920307e01aa0c7.zip | |
s390/lcs: cleanup drv attr usage
Rename attributes of the lcs_group_driver. Also get rid of
the call to driver_remove_file.
Reviewed-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: Sebastian Ott <sebott@linux.vnet.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
| -rw-r--r-- | drivers/s390/net/lcs.c | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/drivers/s390/net/lcs.c b/drivers/s390/net/lcs.c index f1dfc8d72d7..b08292072ad 100644 --- a/drivers/s390/net/lcs.c +++ b/drivers/s390/net/lcs.c @@ -2432,17 +2432,15 @@ static ssize_t lcs_driver_group_store(struct device_driver *ddrv, } static DRIVER_ATTR(group, 0200, NULL, lcs_driver_group_store); -static struct attribute *lcs_group_attrs[] = { +static struct attribute *lcs_drv_attrs[] = { &driver_attr_group.attr, NULL, }; - -static struct attribute_group lcs_group_attr_group = { - .attrs = lcs_group_attrs, +static struct attribute_group lcs_drv_attr_group = { + .attrs = lcs_drv_attrs, }; - -static const struct attribute_group *lcs_group_attr_groups[] = { - &lcs_group_attr_group, +static const struct attribute_group *lcs_drv_attr_groups[] = { + &lcs_drv_attr_group, NULL, }; @@ -2466,7 +2464,7 @@ __init lcs_init_module(void) rc = ccw_driver_register(&lcs_ccw_driver); if (rc) goto ccw_err; - lcs_group_driver.driver.groups = lcs_group_attr_groups; + lcs_group_driver.driver.groups = lcs_drv_attr_groups; rc = ccwgroup_driver_register(&lcs_group_driver); if (rc) goto ccwgroup_err; @@ -2492,8 +2490,6 @@ __exit lcs_cleanup_module(void) { pr_info("Terminating lcs module.\n"); LCS_DBF_TEXT(0, trace, "cleanup"); - driver_remove_file(&lcs_group_driver.driver, - &driver_attr_group); ccwgroup_driver_unregister(&lcs_group_driver); ccw_driver_unregister(&lcs_ccw_driver); root_device_unregister(lcs_root_dev); |