1 files changed, 5 insertions, 3 deletions

diff --git a/drivers/base/core.c b/drivers/base/core.c
index 150a41580fad..417913974df8 100644
--- a/drivers/base/core.c
+++ b/drivers/base/core.c
@@ -1399,7 +1399,7 @@ struct root_device {
         struct module *owner;
 };
 
-inline struct root_device *to_root_device(struct device *d)
+static inline struct root_device *to_root_device(struct device *d)
 {
         return container_of(d, struct root_device, dev);
 }
@@ -1840,10 +1840,12 @@ void device_shutdown(void)
                 pm_runtime_barrier(dev);
 
                 if (dev->bus && dev->bus->shutdown) {
-                        dev_dbg(dev, "shutdown\n");
+                        if (initcall_debug)
+                                dev_info(dev, "shutdown\n");
                         dev->bus->shutdown(dev);
                 } else if (dev->driver && dev->driver->shutdown) {
-                        dev_dbg(dev, "shutdown\n");
+                        if (initcall_debug)
+                                dev_info(dev, "shutdown\n");
                         dev->driver->shutdown(dev);
                 }