forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

s390/lcs: cleanup drv attr usage

Browse source 
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>
This commit is contained in:
Sebastian Ott 2012-05-15 18:05:46 +02:00 • committed by Martin Schwidefsky
parent 330ce1b082
commit 9d2aa0aa8f
1 changed files with 6 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

16
drivers/s390/net/lcs.c
View file

@ -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 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, &driver_attr_group.attr,
NULL, NULL,
}; };
static struct attribute_group lcs_drv_attr_group = {
static struct attribute_group lcs_group_attr_group = { .attrs = lcs_drv_attrs,
.attrs = lcs_group_attrs,
}; };
static const struct attribute_group *lcs_drv_attr_groups[] = {
static const struct attribute_group *lcs_group_attr_groups[] = { &lcs_drv_attr_group,
&lcs_group_attr_group,
NULL, NULL,
}; };
@ -2466,7 +2464,7 @@ __init lcs_init_module(void)
rc = ccw_driver_register(&lcs_ccw_driver); rc = ccw_driver_register(&lcs_ccw_driver);
if (rc) if (rc)
goto ccw_err; 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); rc = ccwgroup_driver_register(&lcs_group_driver);
if (rc) if (rc)
goto ccwgroup_err; goto ccwgroup_err;
@ -2492,8 +2490,6 @@ __exit lcs_cleanup_module(void)
{ {
pr_info("Terminating lcs module.\n"); pr_info("Terminating lcs module.\n");
LCS_DBF_TEXT(0, trace, "cleanup"); LCS_DBF_TEXT(0, trace, "cleanup");
driver_remove_file(&lcs_group_driver.driver,
&driver_attr_group);
ccwgroup_driver_unregister(&lcs_group_driver); ccwgroup_driver_unregister(&lcs_group_driver);
ccw_driver_unregister(&lcs_ccw_driver); ccw_driver_unregister(&lcs_ccw_driver);
root_device_unregister(lcs_root_dev); root_device_unregister(lcs_root_dev);