diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-10-10 14:37:56 +0200 |
|---|---|---|
| committer | Leonard Crestez <leonard.crestez@nxp.com> | 2018-08-24 12:41:33 +0300 |
| commit | f1d0da0af98b6fa3eccf4405b1e6a9564f347ee9 (patch) | |
| tree | 95bf3c550fb94a098b908d0bcec6b79e8daa6ea3 /drivers/base | |
| parent | 5caf8ced292b06a8d71b1d04be4d6dfa1f6003bd (diff) | |
driver core: Add a wrapper around __device_release_driver()
Add an internal wrapper around __device_release_driver() that will
acquire device locks and do the necessary checks before calling it.
The next patch will make use of it.
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit 4bdb35506b89cbbd150c1baa284e7c191698241f)
Diffstat (limited to 'drivers/base')
| -rw-r--r-- | drivers/base/dd.c | 30 |
1 files changed, 18 insertions, 12 deletions
diff --git a/drivers/base/dd.c b/drivers/base/dd.c index ee25a69630c3..0f8a93612cf9 100644 --- a/drivers/base/dd.c +++ b/drivers/base/dd.c @@ -804,6 +804,22 @@ static void __device_release_driver(struct device *dev) } } +static void device_release_driver_internal(struct device *dev, + struct device_driver *drv, + struct device *parent) +{ + if (parent) + device_lock(parent); + + device_lock(dev); + if (!drv || drv == dev->driver) + __device_release_driver(dev); + + device_unlock(dev); + if (parent) + device_unlock(parent); +} + /** * device_release_driver - manually detach device from driver. * @dev: device. @@ -818,9 +834,7 @@ void device_release_driver(struct device *dev) * within their ->remove callback for the same device, they * will deadlock right here. */ - device_lock(dev); - __device_release_driver(dev); - device_unlock(dev); + device_release_driver_internal(dev, NULL, NULL); } EXPORT_SYMBOL_GPL(device_release_driver); @@ -845,15 +859,7 @@ void driver_detach(struct device_driver *drv) dev = dev_prv->device; get_device(dev); spin_unlock(&drv->p->klist_devices.k_lock); - - if (dev->parent) /* Needed for USB */ - device_lock(dev->parent); - device_lock(dev); - if (dev->driver == drv) - __device_release_driver(dev); - device_unlock(dev); - if (dev->parent) - device_unlock(dev->parent); + device_release_driver_internal(dev, drv, dev->parent); put_device(dev); } } |