Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 218f6024 authored by Masahiro Yamada's avatar Masahiro Yamada Committed by Ulf Hansson
Browse files

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: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
Acked-by: default avatarLee Jones <lee.jones@linaro.org>
Reviewed-by: default avatarWolfram Sang <wsa+renesas@sang-engineering.com>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
Tested-by: default avatarWolfram Sang <wsa+renesas@sang-engineering.com>
parent 7c53b797

drivers/mmc/host/tmio_mmc_core.c

+2 −3
Original line number Original line Diff line number Diff line
@@ -1061,10 +1061,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)

static int tmio_mmc_get_ro(struct mmc_host *mmc)

{

{

	struct tmio_mmc_host *host = mmc_priv(mmc);

	struct tmio_mmc_host *host = mmc_priv(mmc);

	struct tmio_mmc_data *pdata = host->pdata;





	return !((pdata->flags & TMIO_MMC_WRPROTECT_DISABLE) ||

	return !(sd_ctrl_read16_and_16_as_32(host, CTL_STATUS) &

		 (sd_ctrl_read16_and_16_as_32(host, CTL_STATUS) & TMIO_STAT_WRPROTECT));

		 TMIO_STAT_WRPROTECT);

}

}





static int tmio_multi_io_quirk(struct mmc_card *card,

static int tmio_multi_io_quirk(struct mmc_card *card,

include/linux/mfd/tmio.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -36,7 +36,6 @@ 
	} while (0)

	} while (0)





/* tmio MMC platform flags */

/* tmio MMC platform flags */

#define TMIO_MMC_WRPROTECT_DISABLE	BIT(0)

/*

/*

 * Some controllers can support a 2-byte block size when the bus width

 * Some controllers can support a 2-byte block size when the bus width

 * is configured in 4-bit mode.

 * is configured in 4-bit mode.