]> git.openfabrics.org - ~shefty/rdma-dev.git/commitdiff
mmc: sdio: Add empty bus-level suspend/resume callbacks
authorRafael J. Wysocki <rjw@sisk.pl>
Sun, 2 Dec 2012 13:48:50 +0000 (14:48 +0100)
committerChris Ball <cjb@laptop.org>
Thu, 6 Dec 2012 18:55:04 +0000 (13:55 -0500)
Suspend methods provided by SDIO drivers are not supposed to be called by
the PM core.  Instead, when the SDIO core gets to suspend a device's
ancestor, it calls the device driver's suspend routine.  However, the PM
core executes suspend callback routines directly for device drivers whose
bus types don't provide suspend callbacks.  In consequece, because the
SDIO bus type doesn't provide a suspend callback, the SDIO drivers'
suspend routines will be executed by the PM core (which shouldn't
happen).

To prevent this from happening, add empty system suspend/resume callbacks
for the SDIO bus type.

An analogous change had been made already by commit (e841a7c mmc: sdio:
Use empty system suspend/resume callbacks at the bus level), but then it
was reverted inadvertently by commit (d8e2ac3 mmc: sdio: Fix PM_SLEEP
related build warnings) that attempted to fix build warnings introduced
by commit e841a7c.

Reported-by: NeilBrown <neilb@suse.de>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: Chris Ball <cjb@laptop.org>
drivers/mmc/core/sdio_bus.c

index 6bf68799fe9733c18643d4e65f57c313abcd5b0b..fc2d94a3b60ca4c0fc9e062389c524c00394db0a 100644 (file)
@@ -193,7 +193,21 @@ static int sdio_bus_remove(struct device *dev)
 }
 
 #ifdef CONFIG_PM
 }
 
 #ifdef CONFIG_PM
+
+#ifdef CONFIG_PM_SLEEP
+static int pm_no_operation(struct device *dev)
+{
+       /*
+        * Prevent the PM core from calling SDIO device drivers' suspend
+        * callback routines, which it is not supposed to do, by using this
+        * empty function as the bus type suspend callaback for SDIO.
+        */
+       return 0;
+}
+#endif
+
 static const struct dev_pm_ops sdio_bus_pm_ops = {
 static const struct dev_pm_ops sdio_bus_pm_ops = {
+       SET_SYSTEM_SLEEP_PM_OPS(pm_no_operation, pm_no_operation)
        SET_RUNTIME_PM_OPS(
                pm_generic_runtime_suspend,
                pm_generic_runtime_resume,
        SET_RUNTIME_PM_OPS(
                pm_generic_runtime_suspend,
                pm_generic_runtime_resume,