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

Commit 0b945293 authored by frank.blaschka@de.ibm.com's avatar frank.blaschka@de.ibm.com Committed by David S. Miller
Browse files

netiucv: cleanup attribute usage 



Let the driver core handle device attribute creation and removal. This
will simplify the code and eliminates races between attribute
availability and userspace notification via uevents.

Signed-off-by: default avatarSebastian Ott <sebott@linux.vnet.ibm.com>
Signed-off-by: default avatarFrank Blaschka <frank.blaschka@de.ibm.com>
Acked-by: default avatarUrsula Braun <ursula.braun@de.ibm.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9fafbd4d

drivers/s390/net/netiucv.c

+6 −28
Original line number Original line Diff line number Diff line
@@ -1854,26 +1854,11 @@ static struct attribute_group netiucv_stat_attr_group = { 
	.attrs = netiucv_stat_attrs,

	.attrs = netiucv_stat_attrs,

};

};





static int netiucv_add_files(struct device *dev)

static const struct attribute_group *netiucv_attr_groups[] = {

{

	&netiucv_stat_attr_group,

	int ret;

	&netiucv_attr_group,



	NULL,

	IUCV_DBF_TEXT(trace, 3, __func__);

};

	ret = sysfs_create_group(&dev->kobj, &netiucv_attr_group);

	if (ret)

		return ret;

	ret = sysfs_create_group(&dev->kobj, &netiucv_stat_attr_group);

	if (ret)

		sysfs_remove_group(&dev->kobj, &netiucv_attr_group);

	return ret;

}



static void netiucv_remove_files(struct device *dev)

{

	IUCV_DBF_TEXT(trace, 3, __func__);

	sysfs_remove_group(&dev->kobj, &netiucv_stat_attr_group);

	sysfs_remove_group(&dev->kobj, &netiucv_attr_group);

}





static int netiucv_register_device(struct net_device *ndev)

static int netiucv_register_device(struct net_device *ndev)

{

{
@@ -1887,6 +1872,7 @@ static int netiucv_register_device(struct net_device *ndev) 
		dev_set_name(dev, "net%s", ndev->name);

		dev_set_name(dev, "net%s", ndev->name);

		dev->bus = &iucv_bus;

		dev->bus = &iucv_bus;

		dev->parent = iucv_root;

		dev->parent = iucv_root;

		dev->groups = netiucv_attr_groups;

		/*

		/*

		 * The release function could be called after the

		 * The release function could be called after the

		 * module has been unloaded. It's _only_ task is to

		 * module has been unloaded. It's _only_ task is to
@@ -1904,22 +1890,14 @@ static int netiucv_register_device(struct net_device *ndev) 
		put_device(dev);

		put_device(dev);

		return ret;

		return ret;

	}

	}

	ret = netiucv_add_files(dev);

	if (ret)

		goto out_unreg;

	priv->dev = dev;

	priv->dev = dev;

	dev_set_drvdata(dev, priv);

	dev_set_drvdata(dev, priv);

	return 0;

	return 0;



out_unreg:

	device_unregister(dev);

	return ret;

}

}





static void netiucv_unregister_device(struct device *dev)

static void netiucv_unregister_device(struct device *dev)

{

{

	IUCV_DBF_TEXT(trace, 3, __func__);

	IUCV_DBF_TEXT(trace, 3, __func__);

	netiucv_remove_files(dev);

	device_unregister(dev);

	device_unregister(dev);

}

}