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

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

s390/qeth: cleanup drv attr usage 



Cleanup attributes of the qeth ccwgroup driver. Ensure availability
of driver attributes by the time the driver is registered.

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 a43f8de6

drivers/s390/net/qeth_core_main.c

+13 −9
Original line number Diff line number Diff line
@@ -5291,6 +5291,18 @@ static ssize_t qeth_core_driver_group_store(struct device_driver *ddrv, 
}

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



static struct attribute *qeth_drv_attrs[] = {

	&driver_attr_group.attr,

	NULL,

};

static struct attribute_group qeth_drv_attr_group = {

	.attrs = qeth_drv_attrs,

};

static const struct attribute_group *qeth_drv_attr_groups[] = {

	&qeth_drv_attr_group,

	NULL,

};



static struct {

	const char str[ETH_GSTRING_LEN];

} qeth_ethtool_stats_keys[] = {
@@ -5531,13 +5543,10 @@ static int __init qeth_core_init(void) 
	rc = ccw_driver_register(&qeth_ccw_driver);

	if (rc)

		goto ccw_err;

	qeth_core_ccwgroup_driver.driver.groups = qeth_drv_attr_groups;

	rc = ccwgroup_driver_register(&qeth_core_ccwgroup_driver);

	if (rc)

		goto ccwgroup_err;

	rc = driver_create_file(&qeth_core_ccwgroup_driver.driver,

				&driver_attr_group);

	if (rc)

		goto driver_err;

	qeth_core_root_dev = root_device_register("qeth");

	rc = IS_ERR(qeth_core_root_dev) ? PTR_ERR(qeth_core_root_dev) : 0;

	if (rc)
@@ -5563,9 +5572,6 @@ static int __init qeth_core_init(void) 
slab_err:

	root_device_unregister(qeth_core_root_dev);

register_err:

	driver_remove_file(&qeth_core_ccwgroup_driver.driver,

			   &driver_attr_group);

driver_err:

	ccwgroup_driver_unregister(&qeth_core_ccwgroup_driver);

ccwgroup_err:

	ccw_driver_unregister(&qeth_ccw_driver);
@@ -5580,8 +5586,6 @@ static int __init qeth_core_init(void) 
static void __exit qeth_core_exit(void)

{

	root_device_unregister(qeth_core_root_dev);

	driver_remove_file(&qeth_core_ccwgroup_driver.driver,

			   &driver_attr_group);

	ccwgroup_driver_unregister(&qeth_core_ccwgroup_driver);

	ccw_driver_unregister(&qeth_ccw_driver);

	kmem_cache_destroy(qeth_qdio_outbuf_cache);