From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1161063AbcFQG2v (ORCPT ); Fri, 17 Jun 2016 02:28:51 -0400 Received: from mailout3.w1.samsung.com ([210.118.77.13]:57146 "EHLO mailout3.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755239AbcFQG1S (ORCPT ); Fri, 17 Jun 2016 02:27:18 -0400 X-AuditID: cbfec7f4-f796c6d000001486-b7-5763983ea067 From: Marek Szyprowski To: linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, iommu@lists.linux-foundation.org, linux-samsung-soc@vger.kernel.org, linux-arm-kernel@lists.infradead.org Cc: Marek Szyprowski , Joerg Roedel , Inki Dae , Kukjin Kim , Krzysztof Kozlowski , Bartlomiej Zolnierkiewicz , "Rafael J. Wysocki" , Ulf Hansson , Mark Brown , Greg Kroah-Hartman , "Rafael J. Wysocki" Subject: [PATCH v2 01/10] driver core: Add a wrapper around __device_release_driver() Date: Fri, 17 Jun 2016 08:26:51 +0200 Message-id: <1466144820-6286-2-git-send-email-m.szyprowski@samsung.com> X-Mailer: git-send-email 1.9.1 In-reply-to: <1466144820-6286-1-git-send-email-m.szyprowski@samsung.com> References: <1466144820-6286-1-git-send-email-m.szyprowski@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrBLMWRmVeSWpSXmKPExsVy+t/xa7p2M5LDDa4cULTYOGM9q8XUh0/Y LJoXr2ezmHR/AovFgv3WFp2zN7BbvH5haNH/+DWzxabH11gtLu+aw2bxufcIo8WM8/uYLNYe uctu8XjFW3aLM6cvsVocXxvuIODx5OA8Jo/Fe14yeWxa1cnmcefaHjaP/XPXsHtsXlLvMfnG ckaPLVfbWTz6tqxi9Pi8SS6AK4rLJiU1J7MstUjfLoEr43bPM5aCC/wVZ7o+MjcwvuTpYuTk kBAwkdi5awcrhC0mceHeerYuRi4OIYGljBKX9k9ngnCamCTert3IAlLFJmAo0fW2C6xKRGAl o8S2PfuYQRxmgavMEnP27ASrEhYIlzi07Sk7iM0ioCpxfMsUMJtXwF1i8ZMmFoh9chInj00G 280p4CHx4tYPsLgQUM2uw6eYJzDyLmBkWMUomlqaXFCclJ5rqFecmFtcmpeul5yfu4kREt5f djAuPmZ1iFGAg1GJh3eFaHK4EGtiWXFl7iFGCQ5mJRFezelAId6UxMqq1KL8+KLSnNTiQ4zS HCxK4rxzd70PERJITyxJzU5NLUgtgskycXBKNTAu0DR44b214Bbr1cKHX5vi3MJmXzhrvLak d6Hd3p/rZM+dS/6+aLreBLfaTw1c0yawBE0JnVgWWXfjHHvHnGPirL3Gjl6/Dha6JiwtnOI3 NfREpMkdI31O/aDorN4Mo54X+zUb9FK4lE5MF+M5ebOkdeHxx25hC0+o9lwJZ6nLv7TMr+Ht fQ8lluKMREMt5qLiRABtsgpSawIAAA== Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: "Rafael J. Wysocki" 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 Signed-off-by: Marek Szyprowski --- drivers/base/dd.c | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/drivers/base/dd.c b/drivers/base/dd.c index 16688f50729c..d9e76e9205c7 100644 --- a/drivers/base/dd.c +++ b/drivers/base/dd.c @@ -796,6 +796,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. @@ -810,9 +826,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); @@ -837,15 +851,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); } } -- 1.9.1