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

Commit 330ce1b0 authored by Sebastian Ott's avatar Sebastian Ott Committed by Martin Schwidefsky
Browse files

s390/ctc: cleanup drv attr usage 



Rename attributes of the ctcm_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 9814fdfb

drivers/s390/net/ctcm_main.c

+6 −9
Original line number Diff line number Diff line
@@ -1786,17 +1786,15 @@ static ssize_t ctcm_driver_group_store(struct device_driver *ddrv, 
}

static DRIVER_ATTR(group, 0200, NULL, ctcm_driver_group_store);



static struct attribute *ctcm_group_attrs[] = {

static struct attribute *ctcm_drv_attrs[] = {

	&driver_attr_group.attr,

	NULL,

};



static struct attribute_group ctcm_group_attr_group = {

	.attrs = ctcm_group_attrs,

static struct attribute_group ctcm_drv_attr_group = {

	.attrs = ctcm_drv_attrs,

};



static const struct attribute_group *ctcm_group_attr_groups[] = {

	&ctcm_group_attr_group,

static const struct attribute_group *ctcm_drv_attr_groups[] = {

	&ctcm_drv_attr_group,

	NULL,

};
@@ -1812,7 +1810,6 @@ static const struct attribute_group *ctcm_group_attr_groups[] = { 
 */

static void __exit ctcm_exit(void)

{

	driver_remove_file(&ctcm_group_driver.driver, &driver_attr_group);

	ccwgroup_driver_unregister(&ctcm_group_driver);

	ccw_driver_unregister(&ctcm_ccw_driver);

	root_device_unregister(ctcm_root_dev);
@@ -1850,7 +1847,7 @@ static int __init ctcm_init(void) 
	ret = ccw_driver_register(&ctcm_ccw_driver);

	if (ret)

		goto ccw_err;

	ctcm_group_driver.driver.groups = ctcm_group_attr_groups;

	ctcm_group_driver.driver.groups = ctcm_drv_attr_groups;

	ret = ccwgroup_driver_register(&ctcm_group_driver);

	if (ret)

		goto ccwgroup_err;