mmc: propagate power save/restore ops return value

Allow power save/restore and their relevant mmc_bus_ops handlers
exit with a return value.

Signed-off-by: Ohad Ben-Cohen <ohad@wizery.com>
Tested-by: Luciano Coelho <luciano.coelho@nokia.com>
Signed-off-by: Chris Ball <cjb@laptop.org>

1 files changed, 14 insertions, 6 deletions

diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c
index 3eb7a9be6d8d..8f86d702e46e 100644
--- a/drivers/mmc/core/core.c
+++ b/drivers/mmc/core/core.c
@@ -1583,37 +1583,45 @@ void mmc_stop_host(struct mmc_host *host)
         mmc_power_off(host);
 }
 
-void mmc_power_save_host(struct mmc_host *host)
+int mmc_power_save_host(struct mmc_host *host)
 {
+        int ret = 0;
+
         mmc_bus_get(host);
 
         if (!host->bus_ops || host->bus_dead || !host->bus_ops->power_restore) {
                 mmc_bus_put(host);
-                return;
+                return -EINVAL;
         }
 
         if (host->bus_ops->power_save)
-                host->bus_ops->power_save(host);
+                ret = host->bus_ops->power_save(host);
 
         mmc_bus_put(host);
 
         mmc_power_off(host);
+
+        return ret;
 }
 EXPORT_SYMBOL(mmc_power_save_host);
 
-void mmc_power_restore_host(struct mmc_host *host)
+int mmc_power_restore_host(struct mmc_host *host)
 {
+        int ret;
+
         mmc_bus_get(host);
 
         if (!host->bus_ops || host->bus_dead || !host->bus_ops->power_restore) {
                 mmc_bus_put(host);
-                return;
+                return -EINVAL;
         }
 
         mmc_power_up(host);
-        host->bus_ops->power_restore(host);
+        ret = host->bus_ops->power_restore(host);
 
         mmc_bus_put(host);
+
+        return ret;
 }
 EXPORT_SYMBOL(mmc_power_restore_host);