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

Commit 70a9156b authored by Eric W. Biederman's avatar Eric W. Biederman Committed by Greg Kroah-Hartman
Browse files

uio: Don't clear driver data 



Currently uio sets it's driver data to NULL just as it is unregistering
attributes.  sysfs maks the guaranatee that it will not call attributes
after device_destroy is called so this is unncessary and leads to lots
of unnecessary code in uio.c

Signed-off-by: default avatarEric W. Biederman <ebiederm@aristanetworks.com>
Reviewed-by: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarHans J. Koch <hjk@linutronix.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 3d4f9d76

drivers/uio/uio.c

+3 −14
Original line number Diff line number Diff line
@@ -229,10 +229,7 @@ static ssize_t show_name(struct device *dev, 
			 struct device_attribute *attr, char *buf)

{

	struct uio_device *idev = dev_get_drvdata(dev);

	if (idev)

	return sprintf(buf, "%s\n", idev->info->name);

	else

		return -ENODEV;

}

static DEVICE_ATTR(name, S_IRUGO, show_name, NULL);
@@ -240,10 +237,7 @@ static ssize_t show_version(struct device *dev, 
			    struct device_attribute *attr, char *buf)

{

	struct uio_device *idev = dev_get_drvdata(dev);

	if (idev)

	return sprintf(buf, "%s\n", idev->info->version);

	else

		return -ENODEV;

}

static DEVICE_ATTR(version, S_IRUGO, show_version, NULL);
@@ -251,11 +245,7 @@ static ssize_t show_event(struct device *dev, 
			  struct device_attribute *attr, char *buf)

{

	struct uio_device *idev = dev_get_drvdata(dev);

	if (idev)

		return sprintf(buf, "%u\n",

				(unsigned int)atomic_read(&idev->event));

	else

		return -ENODEV;

	return sprintf(buf, "%u\n", (unsigned int)atomic_read(&idev->event));

}

static DEVICE_ATTR(event, S_IRUGO, show_event, NULL);
@@ -878,7 +868,6 @@ void uio_unregister_device(struct uio_info *info) 


	uio_dev_del_attributes(idev);



	dev_set_drvdata(idev->dev, NULL);

	device_destroy(uio_class, MKDEV(uio_major, idev->minor));

	kfree(idev);