mmc: remove the unnecessary define and fix the wrong bit control
PATCH 5/9 mmc: remove the unnecessary define and fix the wrong bit control
It's not using anywhere. So it removed the unnecessary define. And modified the bit operation for more readable.
Signed-off-by Jaehoon Chung <[email protected]>
--- drivers/mmc/mmc.c | 2 +- include/mmc.h | 18 ++++++------------ 2 files changed, 7 insertions(+), 13 deletions(-)
drivers/mmc/mmc.c +1 -1
@@ -518,7 +518,7 @@ static int mmc_change_freq(struct mmc *mmc)return 0 ;/* High Speed is set, there are two types: 52MHz and 26MHz */ -if (cardtype &MMC_HS_52MHZ ) +if (cardtype &EXT_CSD_CARD_TYPE_52 ) mmc->card_caps |= MMC_MODE_HS_52MHz |MMC_MODE_HS ;else mmc->card_caps |=MMC_MODE_HS ;
include/mmc.h +6 -12
@@ -31,15 +31,12 @@#define MMC_VERSION_4_41 (MMC_VERSION_MMC | 0x429)#define MMC_VERSION_4_5 (MMC_VERSION_MMC | 0x405) -#define MMC_MODE_HS 0x001 -#define MMC_MODE_HS_52MHz 0x010 -#define MMC_MODE_4BIT 0x100 -#define MMC_MODE_8BIT 0x200 -#define MMC_MODE_SPI 0x400 -#define MMC_MODE_HC 0x800 - -#define MMC_MODE_MASK_WIDTH_BITS (MMC_MODE_4BIT | MMC_MODE_8BIT) -#define MMC_MODE_WIDTH_BITS_SHIFT 8 +#define MMC_MODE_HS (1 << 0) +#define MMC_MODE_HS_52MHz (1 << 1) +#define MMC_MODE_4BIT (1 << 2) +#define MMC_MODE_8BIT (1 << 3) +#define MMC_MODE_SPI (1 << 4) +#define MMC_MODE_HC (1 << 5)#define SD_DATA_4BIT 0x00040000
@@ -97,9 +94,6 @@#define SD_HIGHSPEED_BUSY 0x00020000#define SD_HIGHSPEED_SUPPORTED 0x00020000 -#define MMC_HS_TIMING 0x00000100 -#define MMC_HS_52MHZ 0x2 -#define OCR_BUSY 0x80000000#define OCR_HCS 0x40000000#define OCR_VOLTAGE_MASK 0x007FFF80
Signature · 1 line
1.7.9.5