Skip to content

Commit

Permalink
netiucv: Use device_driver default attribute groups.
Browse files Browse the repository at this point in the history
CC: Ursula Braun <ubraun@linux.vnet.ibm.com>
Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Cornelia Huck authored and Greg Kroah-Hartman committed Jan 25, 2008
1 parent 57c7453 commit 5b88feb
Showing 1 changed file with 6 additions and 10 deletions.
16 changes: 6 additions & 10 deletions drivers/s390/net/netiucv.c
Original file line number Diff line number Diff line change
Expand Up @@ -2089,6 +2089,11 @@ static struct attribute_group netiucv_drv_attr_group = {
.attrs = netiucv_drv_attrs,
};

static struct attribute_group *netiucv_drv_attr_groups[] = {
&netiucv_drv_attr_group,
NULL,
};

static void netiucv_banner(void)
{
PRINT_INFO("NETIUCV driver initialized\n");
Expand All @@ -2113,7 +2118,6 @@ static void __exit netiucv_exit(void)
netiucv_unregister_device(dev);
}

sysfs_remove_group(&netiucv_driver.kobj, &netiucv_drv_attr_group);
driver_unregister(&netiucv_driver);
iucv_unregister(&netiucv_handler, 1);
iucv_unregister_dbf_views();
Expand All @@ -2133,25 +2137,17 @@ static int __init netiucv_init(void)
if (rc)
goto out_dbf;
IUCV_DBF_TEXT(trace, 3, __FUNCTION__);
netiucv_driver.groups = netiucv_drv_attr_groups;
rc = driver_register(&netiucv_driver);
if (rc) {
PRINT_ERR("NETIUCV: failed to register driver.\n");
IUCV_DBF_TEXT_(setup, 2, "ret %d from driver_register\n", rc);
goto out_iucv;
}

rc = sysfs_create_group(&netiucv_driver.kobj, &netiucv_drv_attr_group);
if (rc) {
PRINT_ERR("NETIUCV: failed to add driver attributes.\n");
IUCV_DBF_TEXT_(setup, 2,
"ret %d - netiucv_drv_attr_group\n", rc);
goto out_driver;
}
netiucv_banner();
return rc;

out_driver:
driver_unregister(&netiucv_driver);
out_iucv:
iucv_unregister(&netiucv_handler, 1);
out_dbf:
Expand Down

0 comments on commit 5b88feb

Please sign in to comment.