All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] tmio_mmc_pio: test TMIO_MMC_WRPROTECT_DISABLE earlier
@ 2015-09-23 23:58 ` Sergei Shtylyov
  0 siblings, 0 replies; 14+ messages in thread
From: Sergei Shtylyov @ 2015-09-23 23:58 UTC (permalink / raw)
  To: linux-mmc, ulf.hansson, ian; +Cc: linux-sh

There seems  to be no sense in the runtime PM calls when the actual register
read is suppressed by the TMIO_MMC_WRPROTECT_DISABLE flag.  Check that flag
before trying to read the register and  thus doing the runtime PM dance...

While at it, kill useless local variable and add empty line after declarations.

Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>

---
The patch is against Ulf Hansson's 'mmc.git' repo's 'next' branch.

 drivers/mmc/host/tmio_mmc_pio.c |    8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

Index: mmc/drivers/mmc/host/tmio_mmc_pio.c
===================================================================
--- mmc.orig/drivers/mmc/host/tmio_mmc_pio.c
+++ mmc/drivers/mmc/host/tmio_mmc_pio.c
@@ -988,14 +988,16 @@ static void tmio_mmc_set_ios(struct mmc_
 static int tmio_mmc_get_ro(struct mmc_host *mmc)
 {
 	struct tmio_mmc_host *host = mmc_priv(mmc);
-	struct tmio_mmc_data *pdata = host->pdata;
 	int ret = mmc_gpio_get_ro(mmc);
+
 	if (ret >= 0)
 		return ret;
 
+	if (host->pdata->flags & TMIO_MMC_WRPROTECT_DISABLE)
+		return 0;
+
 	pm_runtime_get_sync(mmc_dev(mmc));
-	ret = !((pdata->flags & TMIO_MMC_WRPROTECT_DISABLE) ||
-		(sd_ctrl_read32(host, CTL_STATUS) & TMIO_STAT_WRPROTECT));
+	ret = !(sd_ctrl_read32(host, CTL_STATUS) & TMIO_STAT_WRPROTECT);
 	pm_runtime_mark_last_busy(mmc_dev(mmc));
 	pm_runtime_put_autosuspend(mmc_dev(mmc));
 


^ permalink raw reply	[flat|nested] 14+ messages in thread

end of thread, other threads:[~2015-09-30 10:07 UTC | newest]

Thread overview: 14+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-09-23 23:58 [PATCH] tmio_mmc_pio: test TMIO_MMC_WRPROTECT_DISABLE earlier Sergei Shtylyov
2015-09-23 23:58 ` Sergei Shtylyov
2015-09-24  7:04 ` Geert Uytterhoeven
2015-09-24  7:04   ` Geert Uytterhoeven
2015-09-25 20:24 ` Ulf Hansson
2015-09-25 20:24   ` Ulf Hansson
2015-09-25 22:13   ` Sergei Shtylyov
2015-09-25 22:13     ` Sergei Shtylyov
2015-09-29 10:22     ` Ulf Hansson
2015-09-29 10:22       ` Ulf Hansson
2015-09-29 14:05       ` Sergei Shtylyov
2015-09-29 14:05         ` Sergei Shtylyov
2015-09-30 10:07         ` Ulf Hansson
2015-09-30 10:07           ` Ulf Hansson

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.