diff options
author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2018-01-17 11:28:10 -0500 |
---|---|---|
committer | Ulf Hansson <ulf.hansson@linaro.org> | 2018-03-05 03:09:04 -0500 |
commit | 218f6024abec04ec78e56b6761f70d404bab8637 (patch) | |
tree | 1f89a998f3dba7d8ffa5b1262fad3a6492d8361d | |
parent | 7c53b79766a463a97dd013715a1cc8a2802f6448 (diff) |
mmc: tmio: remove TMIO_MMC_WRPROTECT_DISABLE
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>
Acked-by: Lee Jones <lee.jones@linaro.org>
Reviewed-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Tested-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
-rw-r--r-- | drivers/mmc/host/tmio_mmc_core.c | 5 | ||||
-rw-r--r-- | 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 1497da07e33c..fb5a29c93ec5 100644 --- a/drivers/mmc/host/tmio_mmc_core.c +++ b/drivers/mmc/host/tmio_mmc_core.c | |||
@@ -1061,10 +1061,9 @@ static void tmio_mmc_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) | |||
1061 | static int tmio_mmc_get_ro(struct mmc_host *mmc) | 1061 | static int tmio_mmc_get_ro(struct mmc_host *mmc) |
1062 | { | 1062 | { |
1063 | struct tmio_mmc_host *host = mmc_priv(mmc); | 1063 | struct tmio_mmc_host *host = mmc_priv(mmc); |
1064 | struct tmio_mmc_data *pdata = host->pdata; | ||
1065 | 1064 | ||
1066 | return !((pdata->flags & TMIO_MMC_WRPROTECT_DISABLE) || | 1065 | return !(sd_ctrl_read16_and_16_as_32(host, CTL_STATUS) & |
1067 | (sd_ctrl_read16_and_16_as_32(host, CTL_STATUS) & TMIO_STAT_WRPROTECT)); | 1066 | TMIO_STAT_WRPROTECT); |
1068 | } | 1067 | } |
1069 | 1068 | ||
1070 | static int tmio_multi_io_quirk(struct mmc_card *card, | 1069 | 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 396a103c8bc6..91f92215ca74 100644 --- a/include/linux/mfd/tmio.h +++ b/include/linux/mfd/tmio.h | |||
@@ -36,7 +36,6 @@ | |||
36 | } while (0) | 36 | } while (0) |
37 | 37 | ||
38 | /* tmio MMC platform flags */ | 38 | /* tmio MMC platform flags */ |
39 | #define TMIO_MMC_WRPROTECT_DISABLE BIT(0) | ||
40 | /* | 39 | /* |
41 | * Some controllers can support a 2-byte block size when the bus width | 40 | * Some controllers can support a 2-byte block size when the bus width |
42 | * is configured in 4-bit mode. | 41 | * is configured in 4-bit mode. |