From: Wolfram Sang Date: Wed, 27 Apr 2016 16:51:25 +0000 (+0200) Subject: mmc: tmio: use CTL_STATUS consistently X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=83e95351d49f60d6cf37706bf94529116d03e648;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git mmc: tmio: use CTL_STATUS consistently To prevent confusion, use the virtual u32 CTL_STATUS in card_busy() the same way as in other parts of this driver. Reviewed-by: Simon Horman Signed-off-by: Wolfram Sang Signed-off-by: Ulf Hansson --- diff --git a/drivers/mmc/host/tmio_mmc.h b/drivers/mmc/host/tmio_mmc.h index 74945c1a66ce..55f251fdb786 100644 --- a/drivers/mmc/host/tmio_mmc.h +++ b/drivers/mmc/host/tmio_mmc.h @@ -67,14 +67,13 @@ #define TMIO_STAT_RXOVERFLOW BIT(20) #define TMIO_STAT_TXUNDERRUN BIT(21) #define TMIO_STAT_CMDTIMEOUT BIT(22) +#define TMIO_STAT_DAT0 BIT(23) /* only known on R-Car so far */ #define TMIO_STAT_RXRDY BIT(24) #define TMIO_STAT_TXRQ BIT(25) #define TMIO_STAT_ILL_FUNC BIT(29) #define TMIO_STAT_CMD_BUSY BIT(30) #define TMIO_STAT_ILL_ACCESS BIT(31) -#define TMIO_STATUS2_DAT0 BIT(7) - #define CLK_CTL_DIV_MASK 0xff #define CLK_CTL_SCLKEN BIT(8) diff --git a/drivers/mmc/host/tmio_mmc_pio.c b/drivers/mmc/host/tmio_mmc_pio.c index 3635940bc31d..57d350744459 100644 --- a/drivers/mmc/host/tmio_mmc_pio.c +++ b/drivers/mmc/host/tmio_mmc_pio.c @@ -964,7 +964,7 @@ static int tmio_mmc_card_busy(struct mmc_host *mmc) { struct tmio_mmc_host *host = mmc_priv(mmc); - return !(sd_ctrl_read16_and_16_as_32(host, CTL_STATUS2) & TMIO_STATUS2_DAT0); + return !(sd_ctrl_read16_and_16_as_32(host, CTL_STATUS) & TMIO_STAT_DAT0); } static struct mmc_host_ops tmio_mmc_ops = {