diff mbox

[v3,10/16] mmc: tmio: remove TMIO_MMC_WRPROTECT_DISABLE

Message ID 1516206496-16612-11-git-send-email-yamada.masahiro@socionext.com (mailing list archive)
State New, archived
Headers show

Commit Message

Masahiro Yamada Jan. 17, 2018, 4:28 p.m. UTC
The use of this flag has been replaced with MMC_CAP2_NO_WRITE_PROTECT.
No platform defines this flag any more.  Remove.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---

Changes in v3:
  - newly added

Changes in v2: None

 drivers/mmc/host/tmio_mmc_core.c | 5 ++---
 include/linux/mfd/tmio.h         | 1 -
 2 files changed, 2 insertions(+), 4 deletions(-)

Comments

Lee Jones Jan. 18, 2018, 8:27 a.m. UTC | #1
On Thu, 18 Jan 2018, Masahiro Yamada wrote:

> The use of this flag has been replaced with MMC_CAP2_NO_WRITE_PROTECT.
> No platform defines this flag any more.  Remove.
> 
> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
> ---
> 
> Changes in v3:
>   - newly added
> 
> Changes in v2: None
> 
>  drivers/mmc/host/tmio_mmc_core.c | 5 ++---
>  include/linux/mfd/tmio.h         | 1 -
>  2 files changed, 2 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/mmc/host/tmio_mmc_core.c b/drivers/mmc/host/tmio_mmc_core.c
> index bdbff2d..7ad3433c 100644
> --- a/drivers/mmc/host/tmio_mmc_core.c
> +++ b/drivers/mmc/host/tmio_mmc_core.c
> @@ -1075,10 +1075,9 @@ static void tmio_mmc_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
>  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;
>  
> -	return !((pdata->flags & TMIO_MMC_WRPROTECT_DISABLE) ||
> -		 (sd_ctrl_read16_and_16_as_32(host, CTL_STATUS) & TMIO_STAT_WRPROTECT));
> +	return !(sd_ctrl_read16_and_16_as_32(host, CTL_STATUS) &
> +		 TMIO_STAT_WRPROTECT);
>  }
>  
>  static int tmio_multi_io_quirk(struct mmc_card *card,
> diff --git a/include/linux/mfd/tmio.h b/include/linux/mfd/tmio.h
> index 396a103c..91f9221 100644
> --- a/include/linux/mfd/tmio.h
> +++ b/include/linux/mfd/tmio.h
> @@ -36,7 +36,6 @@
>  	} while (0)
>  
>  /* tmio MMC platform flags */
> -#define TMIO_MMC_WRPROTECT_DISABLE	BIT(0)

If it is truly not in use after this set:

Acked-by: Lee Jones <lee.jones@linaro.org>
Wolfram Sang Feb. 7, 2018, 7:31 p.m. UTC | #2
On Thu, Jan 18, 2018 at 01:28:10AM +0900, Masahiro Yamada wrote:
> The use of this flag has been replaced with MMC_CAP2_NO_WRITE_PROTECT.
> No platform defines this flag any more.  Remove.
> 
> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>

Reviewed-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
diff mbox

Patch

diff --git a/drivers/mmc/host/tmio_mmc_core.c b/drivers/mmc/host/tmio_mmc_core.c
index bdbff2d..7ad3433c 100644
--- a/drivers/mmc/host/tmio_mmc_core.c
+++ b/drivers/mmc/host/tmio_mmc_core.c
@@ -1075,10 +1075,9 @@  static void tmio_mmc_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
 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;
 
-	return !((pdata->flags & TMIO_MMC_WRPROTECT_DISABLE) ||
-		 (sd_ctrl_read16_and_16_as_32(host, CTL_STATUS) & TMIO_STAT_WRPROTECT));
+	return !(sd_ctrl_read16_and_16_as_32(host, CTL_STATUS) &
+		 TMIO_STAT_WRPROTECT);
 }
 
 static int tmio_multi_io_quirk(struct mmc_card *card,
diff --git a/include/linux/mfd/tmio.h b/include/linux/mfd/tmio.h
index 396a103c..91f9221 100644
--- a/include/linux/mfd/tmio.h
+++ b/include/linux/mfd/tmio.h
@@ -36,7 +36,6 @@ 
 	} while (0)
 
 /* tmio MMC platform flags */
-#define TMIO_MMC_WRPROTECT_DISABLE	BIT(0)
 /*
  * Some controllers can support a 2-byte block size when the bus width
  * is configured in 4-bit mode.