Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9d2aa0aa authored by Sebastian Ott's avatar Sebastian Ott Committed by Martin Schwidefsky
Browse files

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: default avatarCornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: default avatarSebastian Ott <sebott@linux.vnet.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent 330ce1b0

drivers/s390/net/lcs.c

+6 −10
Original line number Diff line number Diff line
@@ -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);