mmc: core: remove the mmc_sd_card_uhs()
RFC PATCH 1/1 mmc: core: remove the mmc_sd_card_uhs()
mmc_sd_card_uhs() didn't has difference with mmc_card_uhs(). And mmc_sd_card_set_uhs() didn't use anywhere.
I'm not sure why mmc_sd_card_uhs() used.
If need to check whether card is sd or not, then we can use the mmc_card_sd().
Signed-off-by Jaehoon Chung <[email protected]>
--- drivers/mmc/core/bus.c | 2 +- drivers/mmc/host/rtsx_pci_sdmmc.c | 2 +- include/linux/mmc/card.h | 2 -- 3 files changed, 2 insertions(+), 4 deletions(-)
drivers/mmc/core/bus.c +1 -1
@@ -340,7 +340,7 @@ int mmc_add_card(struct mmc_card *card)break ; } -if (mmc_sd_card_uhs (card) && +if (mmc_card_uhs (card) && (card->sd_bus_speed <ARRAY_SIZE (uhs_speeds))) uhs_bus_speed_mode = uhs_speeds[card->sd_bus_speed];
drivers/mmc/host/rtsx_pci_sdmmc.c +1 -1
@@ -359,7 +359,7 @@ static int sd_rw_multi(struct realtek_pci_sdmmc *host, struct mmc_request *mrq)struct mmc_host *mmc = host->mmc;struct mmc_card *card = mmc->card;struct mmc_data *data = mrq->data; -int uhs =mmc_sd_card_uhs (card); +int uhs =mmc_card_uhs (card);int read = (data->flags &MMC_DATA_READ ) ?1 :0 ;u8 cfg2, trans_mode;int err;
include/linux/mmc/card.h +0 -2
@@ -420,7 +420,6 @@ static inline void __maybe_unused remove_quirk(struct mmc_card *card, int data)#define mmc_card_blockaddr (c) ((c)->state & MMC_STATE_BLOCKADDR)#define mmc_card_ddr_mode (c) ((c)->state & MMC_STATE_HIGHSPEED_DDR)#define mmc_card_uhs (c) ((c)->state & MMC_STATE_ULTRAHIGHSPEED) -#define mmc_sd_card_uhs (c) ((c)->state & MMC_STATE_ULTRAHIGHSPEED)#define mmc_card_ext_capacity (c) ((c)->state & MMC_CARD_SDXC)#define mmc_card_removed (c) ((c) && ((c)->state & MMC_CARD_REMOVED))#define mmc_card_doing_bkops (c) ((c)->state & MMC_STATE_DOING_BKOPS)
@@ -432,7 +431,6 @@ static inline void __maybe_unused remove_quirk(struct mmc_card *card, int data)#define mmc_card_set_blockaddr (c) ((c)->state |= MMC_STATE_BLOCKADDR)#define mmc_card_set_ddr_mode (c) ((c)->state |= MMC_STATE_HIGHSPEED_DDR)#define mmc_card_set_uhs (c) ((c)->state |= MMC_STATE_ULTRAHIGHSPEED) -#define mmc_sd_card_set_uhs (c) ((c)->state |= MMC_STATE_ULTRAHIGHSPEED)#define mmc_card_set_ext_capacity (c) ((c)->state |= MMC_CARD_SDXC)#define mmc_card_set_removed (c) ((c)->state |= MMC_CARD_REMOVED)#define mmc_card_set_doing_bkops (c) ((c)->state |= MMC_STATE_DOING_BKOPS)
Signature · 1 line
1.7.9.5
I found this patch has already posted at mailing.
http://permalink.gmane.org/gmane.linux.kernel.mmc/20474
Quoted 60 lines · Jaehoon Chung
mmc_sd_card_uhs()didn't has difference withmmc_card_uhs(). Andmmc_sd_card_set_uhs()didn't use anywhere.I'm not sure why
mmc_sd_card_uhs()used.
If need to check whether card is sd or not, then we can use themmc_card_sd().Signed-off-by Jaehoon Chung <[email protected]>--- drivers/mmc/core/bus.c | 2 +- drivers/mmc/host/rtsx_pci_sdmmc.c | 2 +- include/linux/mmc/card.h | 2 -- 3 files changed, 2 insertions(+), 4 deletions(-)drivers/mmc/core/bus.c +1
-1@@ -340,7 +340,7 @@ int mmc_add_card(struct mmc_card *card)break ; } -if (mmc_sd_card_uhs (card) && +if (mmc_card_uhs (card) && (card->sd_bus_speed <ARRAY_SIZE (uhs_speeds))) uhs_bus_speed_mode = uhs_speeds[card->sd_bus_speed];drivers/mmc/host/rtsx_pci_sdmmc.c +1
-1@@ -359,7 +359,7 @@ static int sd_rw_multi(struct realtek_pci_sdmmc *host, struct mmc_request *mrq)struct mmc_host *mmc = host->mmc;struct mmc_card *card = mmc->card;struct mmc_data *data = mrq->data; -int uhs =mmc_sd_card_uhs (card); +int uhs =mmc_card_uhs (card);int read = (data->flags &MMC_DATA_READ ) ?1 :0 ;u8 cfg2, trans_mode;int err;include/linux/mmc/card.h +0
-2@@ -420,7 +420,6 @@ static inline void __maybe_unused remove_quirk(struct mmc_card *card, int data)#define mmc_card_blockaddr (c) ((c)->state & MMC_STATE_BLOCKADDR)#define mmc_card_ddr_mode (c) ((c)->state & MMC_STATE_HIGHSPEED_DDR)#define mmc_card_uhs (c) ((c)->state & MMC_STATE_ULTRAHIGHSPEED) -#define mmc_sd_card_uhs (c) ((c)->state & MMC_STATE_ULTRAHIGHSPEED)#define mmc_card_ext_capacity (c) ((c)->state & MMC_CARD_SDXC)#define mmc_card_removed (c) ((c) && ((c)->state & MMC_CARD_REMOVED))#define mmc_card_doing_bkops (c) ((c)->state & MMC_STATE_DOING_BKOPS)@@ -432,7 +431,6 @@ static inline void __maybe_unused remove_quirk(struct mmc_card *card, int data)#define mmc_card_set_blockaddr (c) ((c)->state |= MMC_STATE_BLOCKADDR)#define mmc_card_set_ddr_mode (c) ((c)->state |= MMC_STATE_HIGHSPEED_DDR)#define mmc_card_set_uhs (c) ((c)->state |= MMC_STATE_ULTRAHIGHSPEED) -#define mmc_sd_card_set_uhs (c) ((c)->state |= MMC_STATE_ULTRAHIGHSPEED)#define mmc_card_set_ext_capacity (c) ((c)->state |= MMC_CARD_SDXC)#define mmc_card_set_removed (c) ((c)->state |= MMC_CARD_REMOVED)#define mmc_card_set_doing_bkops (c) ((c)->state |= MMC_STATE_DOING_BKOPS)