From: Adrian Hunter <adrian.hunter@intel.com>
Date: Fri, 9 Jun 2017 12:27:17 +0000 (+0300)
Subject: mmc: sdio: Tidy error path in mmc_attach_sdio()
X-Git-Tag: v4.14-rc1~618^2~29
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=82e7edc216f1a066da10f224ae2e4cd83e53fc13;p=platform%2Fkernel%2Flinux-rpi.git

mmc: sdio: Tidy error path in mmc_attach_sdio()

The error path deletes the device by calling mmc_sdio_remove() which must
be called without the host claimed. Simplify the error path so it does just
that and add a comment about why we don't disable runtime PM.

Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
---

diff --git a/drivers/mmc/core/sdio.c b/drivers/mmc/core/sdio.c
index fae732c..f077fc8 100644
--- a/drivers/mmc/core/sdio.c
+++ b/drivers/mmc/core/sdio.c
@@ -1159,15 +1159,14 @@ int mmc_attach_sdio(struct mmc_host *host)
 	return 0;
 
 
-remove_added:
-	/* Remove without lock if the device has been added. */
-	mmc_sdio_remove(host);
-	mmc_claim_host(host);
 remove:
-	/* And with lock if it hasn't been added. */
 	mmc_release_host(host);
-	if (host->card)
-		mmc_sdio_remove(host);
+remove_added:
+	/*
+	 * The devices are being deleted so it is not necessary to disable
+	 * runtime PM.
+	 */
+	mmc_sdio_remove(host);
 	mmc_claim_host(host);
 err:
 	mmc_detach_bus(host);