mmc: pwrseq: simplify alloc/free hooks

The alloc() and free() hooks required each pwrseq implementation to set
host->pwrseq themselves. This is error-prone and could be done at a
higher level if alloc() was changed to return a pointer to a struct
mmc_pwrseq instead of an error code.

This patch performs this change and moves the burden of maintaining
host->pwrseq from the power sequence hooks to the pwrseq code.

Signed-off-by: Alexandre Courbot <acourbot@nvidia.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

1 files changed, 5 insertions, 6 deletions

diff --git a/drivers/mmc/core/pwrseq_emmc.c b/drivers/mmc/core/pwrseq_emmc.c
index a2d545904fbf..9d6d2fb21796 100644
--- a/drivers/mmc/core/pwrseq_emmc.c
+++ b/drivers/mmc/core/pwrseq_emmc.c
@@ -49,7 +49,6 @@ static void mmc_pwrseq_emmc_free(struct mmc_host *host)
         unregister_restart_handler(&pwrseq->reset_nb);
         gpiod_put(pwrseq->reset_gpio);
         kfree(pwrseq);
-        host->pwrseq = NULL;
 }
 
 static struct mmc_pwrseq_ops mmc_pwrseq_emmc_ops = {
@@ -67,14 +66,15 @@ static int mmc_pwrseq_emmc_reset_nb(struct notifier_block *this,
         return NOTIFY_DONE;
 }
 
-int mmc_pwrseq_emmc_alloc(struct mmc_host *host, struct device *dev)
+struct mmc_pwrseq *mmc_pwrseq_emmc_alloc(struct mmc_host *host,
+                                         struct device *dev)
 {
         struct mmc_pwrseq_emmc *pwrseq;
         int ret = 0;
 
         pwrseq = kzalloc(sizeof(struct mmc_pwrseq_emmc), GFP_KERNEL);
         if (!pwrseq)
-                return -ENOMEM;
+                return ERR_PTR(-ENOMEM);
 
         pwrseq->reset_gpio = gpiod_get_index(dev, "reset", 0, GPIOD_OUT_LOW);
         if (IS_ERR(pwrseq->reset_gpio)) {
@@ -92,10 +92,9 @@ int mmc_pwrseq_emmc_alloc(struct mmc_host *host, struct device *dev)
         register_restart_handler(&pwrseq->reset_nb);
 
         pwrseq->pwrseq.ops = &mmc_pwrseq_emmc_ops;
-        host->pwrseq = &pwrseq->pwrseq;
 
-        return 0;
+        return &pwrseq->pwrseq;
 free:
         kfree(pwrseq);
-        return ret;
+        return ERR_PTR(ret);
 }