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 4/4] Revert "driver core: correct device's shutdown order"
Date: Tue, 3 Jul 2018 14:50:42 +0800 [thread overview]
Message-ID: <1530600642-25090-5-git-send-email-kernelfans@gmail.com> (raw)
In-Reply-To: <1530600642-25090-1-git-send-email-kernelfans@gmail.com>
This reverts commit 52cdbdd49853dfa856082edb0f4c4c0249d9df07.
Since the device_shutdown() does not rely on the order in devices_kset any
more, reverting that commit safely.
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/base.h | 1 -
drivers/base/core.c | 49 -------------------------------------------------
drivers/base/dd.c | 8 --------
3 files changed, 58 deletions(-)
diff --git a/drivers/base/base.h b/drivers/base/base.h
index a75c302..5bc9064 100644
--- a/drivers/base/base.h
+++ b/drivers/base/base.h
@@ -135,7 +135,6 @@ extern void device_unblock_probing(void);
/* /sys/devices directory */
extern struct kset *devices_kset;
-extern void devices_kset_move_last(struct device *dev);
#if defined(CONFIG_MODULES) && defined(CONFIG_SYSFS)
extern void module_add_driver(struct module *mod, struct device_driver *drv);
diff --git a/drivers/base/core.c b/drivers/base/core.c
index db3deb8..570aeee 100644
--- a/drivers/base/core.c
+++ b/drivers/base/core.c
@@ -1259,52 +1259,6 @@ static DEVICE_ATTR_RO(dev);
struct kset *devices_kset;
/**
- * devices_kset_move_before - Move device in the devices_kset's list.
- * @deva: Device to move.
- * @devb: Device @deva should come before.
- */
-static void devices_kset_move_before(struct device *deva, struct device *devb)
-{
- if (!devices_kset)
- return;
- pr_debug("devices_kset: Moving %s before %s\n",
- dev_name(deva), dev_name(devb));
- spin_lock(&devices_kset->list_lock);
- list_move_tail(&deva->kobj.entry, &devb->kobj.entry);
- spin_unlock(&devices_kset->list_lock);
-}
-
-/**
- * devices_kset_move_after - Move device in the devices_kset's list.
- * @deva: Device to move
- * @devb: Device @deva should come after.
- */
-static void devices_kset_move_after(struct device *deva, struct device *devb)
-{
- if (!devices_kset)
- return;
- pr_debug("devices_kset: Moving %s after %s\n",
- dev_name(deva), dev_name(devb));
- spin_lock(&devices_kset->list_lock);
- list_move(&deva->kobj.entry, &devb->kobj.entry);
- spin_unlock(&devices_kset->list_lock);
-}
-
-/**
- * devices_kset_move_last - move the device to the end of devices_kset's list.
- * @dev: device to move
- */
-void devices_kset_move_last(struct device *dev)
-{
- if (!devices_kset)
- return;
- pr_debug("devices_kset: Moving %s to end of list\n", dev_name(dev));
- spin_lock(&devices_kset->list_lock);
- list_move_tail(&dev->kobj.entry, &devices_kset->list);
- spin_unlock(&devices_kset->list_lock);
-}
-
-/**
* device_create_file - create sysfs attribute file for device.
* @dev: device.
* @attr: device attribute descriptor.
@@ -2776,15 +2730,12 @@ int device_move(struct device *dev, struct device *new_parent,
break;
case DPM_ORDER_DEV_AFTER_PARENT:
device_pm_move_after(dev, new_parent);
- devices_kset_move_after(dev, new_parent);
break;
case DPM_ORDER_PARENT_BEFORE_DEV:
device_pm_move_before(new_parent, dev);
- devices_kset_move_before(new_parent, dev);
break;
case DPM_ORDER_DEV_LAST:
device_pm_move_last(dev);
- devices_kset_move_last(dev);
break;
}
diff --git a/drivers/base/dd.c b/drivers/base/dd.c
index 1435d72..6ebcd65 100644
--- a/drivers/base/dd.c
+++ b/drivers/base/dd.c
@@ -434,14 +434,6 @@ static int really_probe(struct device *dev, struct device_driver *drv)
goto probe_failed;
}
- /*
- * Ensure devices are listed in devices_kset in correct order
- * It's important to move Dev to the end of devices_kset before
- * calling .probe, because it could be recursive and parent Dev
- * should always go first
- */
- devices_kset_move_last(dev);
-
if (dev->bus->probe) {
ret = dev->bus->probe(dev);
if (ret)
--
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 ` [PATCHv3 1/4] drivers/base: fold the routine of device's shutdown into a func Pingfan Liu
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 ` Pingfan Liu [this message]
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-5-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).