Do not disable driver and bus shutdown hook when class shutdown hook is set.

As seen from the implementation of the single class shutdown hook this
is not very sound design.

Rename the class shutdown hook to shutdown_pre to make it clear it runs
before the driver shutdown hook.

Signed-off-by: Michal Suchanek <msuchanek@suse.de>
Reviewed-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1 files changed, 5 insertions, 4 deletions

diff --git a/drivers/base/core.c b/drivers/base/core.c
index cb4b5b1f1b09..12ebd055724c 100644
--- a/drivers/base/core.c
+++ b/drivers/base/core.c
@@ -2796,11 +2796,12 @@ void device_shutdown(void)
                 pm_runtime_get_noresume(dev);
                 pm_runtime_barrier(dev);
 
-                if (dev->class && dev->class->shutdown) {
+                if (dev->class && dev->class->shutdown_pre) {
                         if (initcall_debug)
-                                dev_info(dev, "shutdown\n");
-                        dev->class->shutdown(dev);
-                } else if (dev->bus && dev->bus->shutdown) {
+                                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);