From: Pingfan Liu <kernelfans@gmail.com>
To: linux-kernel@vger.kernel.org
Cc: Pingfan Liu <kernelfans@gmail.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
"Rafael J . Wysocki" <rafael.j.wysocki@intel.com>,
Grygorii Strashko <grygorii.strashko@ti.com>,
Christoph Hellwig <hch@infradead.org>,
Bjorn Helgaas <helgaas@kernel.org>,
Dave Young <dyoung@redhat.com>,
linux-pci@vger.kernel.org, linuxppc-dev@lists.ozlabs.org
Subject: [PATCHv3 1/4] drivers/base: fold the routine of device's shutdown into a func
Date: Tue, 3 Jul 2018 14:50:39 +0800 [thread overview]
Message-ID: <1530600642-25090-2-git-send-email-kernelfans@gmail.com> (raw)
In-Reply-To: <1530600642-25090-1-git-send-email-kernelfans@gmail.com>
Pack the code into a function to ease the using and reading.
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Cc: Grygorii Strashko <grygorii.strashko@ti.com>
Cc: Christoph Hellwig <hch@infradead.org>
Cc: Bjorn Helgaas <helgaas@kernel.org>
Cc: Dave Young <dyoung@redhat.com>
Cc: linux-pci@vger.kernel.org
Cc: linuxppc-dev@lists.ozlabs.org
Signed-off-by: Pingfan Liu <kernelfans@gmail.com>
---
drivers/base/core.c | 100 +++++++++++++++++++++++++++-------------------------
1 file changed, 52 insertions(+), 48 deletions(-)
diff --git a/drivers/base/core.c b/drivers/base/core.c
index df3e1a4..a48868f 100644
--- a/drivers/base/core.c
+++ b/drivers/base/core.c
@@ -2802,12 +2802,62 @@ int device_move(struct device *dev, struct device *new_parent,
}
EXPORT_SYMBOL_GPL(device_move);
+static void __device_shutdown(struct device *dev)
+{
+ struct device *parent;
+ /*
+ * hold reference count of device's parent to
+ * prevent it from being freed because parent's
+ * lock is to be held
+ */
+ parent = get_device(dev->parent);
+ get_device(dev);
+ /*
+ * Make sure the device is off the kset list, in the
+ * event that dev->*->shutdown() doesn't remove it.
+ */
+ list_del_init(&dev->kobj.entry);
+ spin_unlock(&devices_kset->list_lock);
+
+ /* hold lock to avoid race with probe/release */
+ if (parent)
+ device_lock(parent);
+ device_lock(dev);
+
+ /* Don't allow any more runtime suspends */
+ pm_runtime_get_noresume(dev);
+ pm_runtime_barrier(dev);
+
+ if (dev->class && dev->class->shutdown_pre) {
+ if (initcall_debug)
+ dev_info(dev, "shutdown_pre\n");
+ dev->class->shutdown_pre(dev);
+ }
+ if (dev->bus && dev->bus->shutdown) {
+ if (initcall_debug)
+ dev_info(dev, "shutdown\n");
+ dev->bus->shutdown(dev);
+ } else if (dev->driver && dev->driver->shutdown) {
+ if (initcall_debug)
+ dev_info(dev, "shutdown\n");
+ dev->driver->shutdown(dev);
+ }
+
+ device_unlock(dev);
+ if (parent)
+ device_unlock(parent);
+
+ put_device(dev);
+ put_device(parent);
+ spin_lock(&devices_kset->list_lock);
+}
+
/**
* device_shutdown - call ->shutdown() on each device to shutdown.
*/
void device_shutdown(void)
{
- struct device *dev, *parent;
+ struct device *dev;
spin_lock(&devices_kset->list_lock);
/*
@@ -2818,53 +2868,7 @@ void device_shutdown(void)
while (!list_empty(&devices_kset->list)) {
dev = list_entry(devices_kset->list.prev, struct device,
kobj.entry);
-
- /*
- * hold reference count of device's parent to
- * prevent it from being freed because parent's
- * lock is to be held
- */
- parent = get_device(dev->parent);
- get_device(dev);
- /*
- * Make sure the device is off the kset list, in the
- * event that dev->*->shutdown() doesn't remove it.
- */
- list_del_init(&dev->kobj.entry);
- spin_unlock(&devices_kset->list_lock);
-
- /* hold lock to avoid race with probe/release */
- if (parent)
- device_lock(parent);
- device_lock(dev);
-
- /* Don't allow any more runtime suspends */
- pm_runtime_get_noresume(dev);
- pm_runtime_barrier(dev);
-
- if (dev->class && dev->class->shutdown_pre) {
- if (initcall_debug)
- dev_info(dev, "shutdown_pre\n");
- dev->class->shutdown_pre(dev);
- }
- if (dev->bus && dev->bus->shutdown) {
- if (initcall_debug)
- dev_info(dev, "shutdown\n");
- dev->bus->shutdown(dev);
- } else if (dev->driver && dev->driver->shutdown) {
- if (initcall_debug)
- dev_info(dev, "shutdown\n");
- dev->driver->shutdown(dev);
- }
-
- device_unlock(dev);
- if (parent)
- device_unlock(parent);
-
- put_device(dev);
- put_device(parent);
-
- spin_lock(&devices_kset->list_lock);
+ __device_shutdown(dev);
}
spin_unlock(&devices_kset->list_lock);
}
--
2.7.4
next prev parent reply other threads:[~2018-07-03 6:51 UTC|newest]
Thread overview: 51+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-03 6:50 [PATCHv3 0/4] drivers/base: bugfix for supplier<-consumer ordering in device_kset Pingfan Liu
2018-07-03 6:50 ` Pingfan Liu [this message]
2018-07-03 6:50 ` [PATCHv3 2/4] drivers/base: utilize device tree info to shutdown devices Pingfan Liu
2018-07-03 7:51 ` Lukas Wunner
2018-07-03 9:26 ` Pingfan Liu
2018-07-04 3:10 ` Pingfan Liu
2018-07-03 10:58 ` Andy Shevchenko
2018-07-03 17:03 ` Pavel Tatashin
2018-07-04 17:04 ` kbuild test robot
2018-07-05 10:11 ` Rafael J. Wysocki
2018-07-06 3:02 ` Pingfan Liu
2018-07-06 9:53 ` Rafael J. Wysocki
2018-07-07 4:02 ` Pingfan Liu
2018-07-06 10:00 ` [PATCH] driver core: Drop devices_kset_move_last() call from really_probe() Rafael J. Wysocki
2018-07-09 13:57 ` Bjorn Helgaas
2018-07-09 21:35 ` Rafael J. Wysocki
2018-07-09 22:06 ` Bjorn Helgaas
2018-07-10 6:19 ` Kishon Vijay Abraham I
2018-07-10 10:32 ` Rafael J. Wysocki
2018-07-10 10:29 ` Rafael J. Wysocki
2018-07-10 6:33 ` Pingfan Liu
2018-07-10 11:35 ` [PATCH] driver core: Partially revert "driver core: correct device's shutdown order" Rafael J. Wysocki
2018-07-10 12:22 ` Kishon Vijay Abraham I
2018-07-10 12:38 ` Rafael J. Wysocki
2018-07-10 12:51 ` [PATCH v2] " Rafael J. Wysocki
2018-07-10 12:59 ` Greg Kroah-Hartman
2018-07-10 15:40 ` Rafael J. Wysocki
2018-07-10 15:47 ` Greg Kroah-Hartman
2018-07-10 19:13 ` Kishon Vijay Abraham I
2018-07-03 6:50 ` [PATCHv3 3/4] drivers/base: clean up the usage of devices_kset_move_last() Pingfan Liu
2018-07-03 14:26 ` Rafael J. Wysocki
2018-07-04 4:40 ` Pingfan Liu
2018-07-04 10:17 ` Rafael J. Wysocki
2018-07-05 2:32 ` Pingfan Liu
2018-07-03 6:50 ` [PATCHv3 4/4] Revert "driver core: correct device's shutdown order" Pingfan Liu
2018-07-03 14:35 ` [PATCHv3 0/4] drivers/base: bugfix for supplier<-consumer ordering in device_kset Rafael J. Wysocki
2018-07-04 2:47 ` Pingfan Liu
2018-07-04 10:21 ` Rafael J. Wysocki
2018-07-05 2:44 ` Pingfan Liu
2018-07-05 9:18 ` Rafael J. Wysocki
2018-07-06 8:36 ` Lukas Wunner
2018-07-06 8:47 ` Rafael J. Wysocki
2018-07-06 13:55 ` Pingfan Liu
2018-07-07 4:24 ` Pingfan Liu
2018-07-08 8:25 ` Rafael J. Wysocki
2018-07-09 6:48 ` Pingfan Liu
2018-07-09 7:48 ` Rafael J. Wysocki
2018-07-09 8:40 ` Pingfan Liu
2018-07-09 8:58 ` Rafael J. Wysocki
2018-07-06 10:02 ` Kishon Vijay Abraham I
2018-07-06 13:52 ` Pingfan Liu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1530600642-25090-2-git-send-email-kernelfans@gmail.com \
--to=kernelfans@gmail.com \
--cc=dyoung@redhat.com \
--cc=gregkh@linuxfoundation.org \
--cc=grygorii.strashko@ti.com \
--cc=hch@infradead.org \
--cc=helgaas@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=rafael.j.wysocki@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).