s390/cio: use device_lock to synchronize calls to the ccwgroup driver

When calling set_{on,off}line of a ccwgroup device driver we hold
the module reference of the owner. This is pretty useless - we don't
want to prevent module unloading but driver unbinding. Use the
driver core's device_lock instead.

Reviewed-by: Peter Oberparleiter <oberpar@linux.vnet.ibm.com>
Signed-off-by: Sebastian Ott <sebott@linux.vnet.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
This commit is contained in:
Sebastian Ott 2013-12-16 10:56:46 +01:00 committed by Martin Schwidefsky
parent 00381eeb47
commit d5b877ffb9
1 changed files with 6 additions and 6 deletions

View File

@ -128,14 +128,14 @@ static ssize_t ccwgroup_online_store(struct device *dev,
const char *buf, size_t count) const char *buf, size_t count)
{ {
struct ccwgroup_device *gdev = to_ccwgroupdev(dev); struct ccwgroup_device *gdev = to_ccwgroupdev(dev);
struct ccwgroup_driver *gdrv = to_ccwgroupdrv(dev->driver);
unsigned long value; unsigned long value;
int ret; int ret;
if (!dev->driver) device_lock(dev);
return -EINVAL; if (!dev->driver) {
if (!try_module_get(gdrv->driver.owner)) ret = -EINVAL;
return -EINVAL; goto out;
}
ret = kstrtoul(buf, 0, &value); ret = kstrtoul(buf, 0, &value);
if (ret) if (ret)
@ -148,7 +148,7 @@ static ssize_t ccwgroup_online_store(struct device *dev,
else else
ret = -EINVAL; ret = -EINVAL;
out: out:
module_put(gdrv->driver.owner); device_unlock(dev);
return (ret == 0) ? count : ret; return (ret == 0) ? count : ret;
} }