Commit 71ef1ea4 authored by Jackey Shen's avatar Jackey Shen Committed by Chris Ball
Browse files

mmc: core: clean up duplicate macros 



Clean up the duplicate macros:
mmc_sd_card_uhs -> mmc_card_uhs
mmc_sd_card_set_uhs -> mmc_card_set_uhs

Signed-off-by: default avatarJackey Shen <jackey.shen@amd.com>
Signed-off-by: default avatarChris Ball <cjb@laptop.org>
parent fbd986cd

drivers/mmc/core/bus.c

+1 −1
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -364,7 +364,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
Original line number Diff line number Diff line
@@ -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)