[17/21] mmc: omap: Don't use mmc_card_present() when validating for inserted card

Message ID 1483102054-1752-18-git-send-email-ulf.hansson@linaro.org
State Superseded
Headers show

Commit Message

Ulf Hansson Dec. 30, 2016, 12:47 p.m.
The mmc_card_present() function helps the mmc core to track an internal
state of the card device. More importantly, it's not intended to be used by
mmc host drivers to check for an inserted card. Therefore, let's stop using
it and instead rely on checking for a valid pointer to a struct mmc_card,
as it should be good enough.

Cc: linux-omap@vger.kernel.org
Cc: Tony Lindgren <tony@atomide.com>
Cc: Jarkko Nikula <jarkko.nikula@bitmer.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

---
 drivers/mmc/host/omap.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

-- 
1.9.1

Comments

Tony Lindgren Jan. 2, 2017, 5:11 p.m. | #1
* Ulf Hansson <ulf.hansson@linaro.org> [161230 04:49]:
> The mmc_card_present() function helps the mmc core to track an internal

> state of the card device. More importantly, it's not intended to be used by

> mmc host drivers to check for an inserted card. Therefore, let's stop using

> it and instead rely on checking for a valid pointer to a struct mmc_card,

> as it should be good enough.

> 

> Cc: linux-omap@vger.kernel.org

> Cc: Tony Lindgren <tony@atomide.com>

> Cc: Jarkko Nikula <jarkko.nikula@bitmer.com>

> Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

> ---

>  drivers/mmc/host/omap.c | 2 +-

>  1 file changed, 1 insertion(+), 1 deletion(-)

> 

> diff --git a/drivers/mmc/host/omap.c b/drivers/mmc/host/omap.c

> index be3c49f..bd49f34 100644

> --- a/drivers/mmc/host/omap.c

> +++ b/drivers/mmc/host/omap.c

> @@ -893,7 +893,7 @@ static void mmc_omap_cover_handler(unsigned long param)

>  	 * If no card is inserted, we postpone polling until

>  	 * the cover has been closed.

>  	 */

> -	if (slot->mmc->card == NULL || !mmc_card_present(slot->mmc->card))

> +	if (slot->mmc->card == NULL)

>  		return;

>  

>  	mod_timer(&slot->cover_timer,


Makes sense to me:

Acked-by: Tony Lindgren <tony@atomide.com>

--
To unsubscribe from this list: send the line "unsubscribe linux-mmc" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Linus Walleij Jan. 9, 2017, 6:24 p.m. | #2
On Fri, Dec 30, 2016 at 1:47 PM, Ulf Hansson <ulf.hansson@linaro.org> wrote:

> The mmc_card_present() function helps the mmc core to track an internal

> state of the card device. More importantly, it's not intended to be used by

> mmc host drivers to check for an inserted card. Therefore, let's stop using

> it and instead rely on checking for a valid pointer to a struct mmc_card,

> as it should be good enough.

>

> Cc: linux-omap@vger.kernel.org

> Cc: Tony Lindgren <tony@atomide.com>

> Cc: Jarkko Nikula <jarkko.nikula@bitmer.com>

> Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>


Reviewed-by: Linus Walleij <linus.walleij@linaro.org>


Yours,
Linus Walleij
--
To unsubscribe from this list: send the line "unsubscribe linux-mmc" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/drivers/mmc/host/omap.c b/drivers/mmc/host/omap.c
index be3c49f..bd49f34 100644
--- a/drivers/mmc/host/omap.c
+++ b/drivers/mmc/host/omap.c
@@ -893,7 +893,7 @@  static void mmc_omap_cover_handler(unsigned long param)
 	 * If no card is inserted, we postpone polling until
 	 * the cover has been closed.
 	 */
-	if (slot->mmc->card == NULL || !mmc_card_present(slot->mmc->card))
+	if (slot->mmc->card == NULL)
 		return;
 
 	mod_timer(&slot->cover_timer,