* [PATCH] mmc: clean up the duplicate code
@ 2013-05-17 9:17 Jackey Shen
2013-07-31 9:12 ` Shen, Jackey
2013-09-26 1:52 ` Chris Ball
0 siblings, 2 replies; 3+ messages in thread
From: Jackey Shen @ 2013-05-17 9:17 UTC (permalink / raw)
To: linux-mmc; +Cc: Jackey Shen
clean up the duplicate micros:
mmc_sd_card_uhs -> mmc_card_uhs
mmc_sd_card_set_uhs -> mmc_card_set_uhs
Signed-off-by: Jackey Shen <jackey.shen@amd.com>
---
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(-)
diff --git a/drivers/mmc/core/bus.c b/drivers/mmc/core/bus.c
index e219c97..820f6fa 100644
--- a/drivers/mmc/core/bus.c
+++ b/drivers/mmc/core/bus.c
@@ -298,7 +298,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];
diff --git a/drivers/mmc/host/rtsx_pci_sdmmc.c b/drivers/mmc/host/rtsx_pci_sdmmc.c
index ad13f42..c979b86 100644
--- a/drivers/mmc/host/rtsx_pci_sdmmc.c
+++ b/drivers/mmc/host/rtsx_pci_sdmmc.c
@@ -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;
diff --git a/include/linux/mmc/card.h b/include/linux/mmc/card.h
index f31725b..8ac2079 100644
--- a/include/linux/mmc/card.h
+++ b/include/linux/mmc/card.h
@@ -412,7 +412,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)
@@ -424,7 +423,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)
--
1.7.10.4
^ permalink raw reply related [flat|nested] 3+ messages in thread
* RE: [PATCH] mmc: clean up the duplicate code
2013-05-17 9:17 [PATCH] mmc: clean up the duplicate code Jackey Shen
@ 2013-07-31 9:12 ` Shen, Jackey
2013-09-26 1:52 ` Chris Ball
1 sibling, 0 replies; 3+ messages in thread
From: Shen, Jackey @ 2013-07-31 9:12 UTC (permalink / raw)
To: Chris Ball; +Cc: linux-mmc, Shen, Jackey
Hi Chris,
Could you please push into mmc-next if you have no comments?
Thanks,
Jackey
-----Original Message-----
From: Jackey Shen [mailto:jackey.shen@amd.com]
Sent: Friday, May 17, 2013 5:18 PM
To: linux-mmc@vger.kernel.org
Cc: Shen, Jackey
Subject: [PATCH] mmc: clean up the duplicate code
clean up the duplicate micros:
mmc_sd_card_uhs -> mmc_card_uhs
mmc_sd_card_set_uhs -> mmc_card_set_uhs
Signed-off-by: Jackey Shen <jackey.shen@amd.com>
---
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(-)
diff --git a/drivers/mmc/core/bus.c b/drivers/mmc/core/bus.c
index e219c97..820f6fa 100644
--- a/drivers/mmc/core/bus.c
+++ b/drivers/mmc/core/bus.c
@@ -298,7 +298,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];
diff --git a/drivers/mmc/host/rtsx_pci_sdmmc.c b/drivers/mmc/host/rtsx_pci_sdmmc.c
index ad13f42..c979b86 100644
--- a/drivers/mmc/host/rtsx_pci_sdmmc.c
+++ b/drivers/mmc/host/rtsx_pci_sdmmc.c
@@ -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;
diff --git a/include/linux/mmc/card.h b/include/linux/mmc/card.h
index f31725b..8ac2079 100644
--- a/include/linux/mmc/card.h
+++ b/include/linux/mmc/card.h
@@ -412,7 +412,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)
@@ -424,7 +423,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)
--
1.7.10.4
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] mmc: clean up the duplicate code
2013-05-17 9:17 [PATCH] mmc: clean up the duplicate code Jackey Shen
2013-07-31 9:12 ` Shen, Jackey
@ 2013-09-26 1:52 ` Chris Ball
1 sibling, 0 replies; 3+ messages in thread
From: Chris Ball @ 2013-09-26 1:52 UTC (permalink / raw)
To: Jackey Shen; +Cc: linux-mmc
Hi Jackey,
On Fri, May 17 2013, Jackey Shen wrote:
> clean up the duplicate micros:
> mmc_sd_card_uhs -> mmc_card_uhs
> mmc_sd_card_set_uhs -> mmc_card_set_uhs
>
> Signed-off-by: Jackey Shen <jackey.shen@amd.com>
> ---
> 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(-)
Sorry for the long delay -- pushed to mmc-next for 3.13 now, thanks.
- Chris.
--
Chris Ball <cjb@laptop.org> <http://printf.net/>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-09-26 1:52 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-05-17 9:17 [PATCH] mmc: clean up the duplicate code Jackey Shen
2013-07-31 9:12 ` Shen, Jackey
2013-09-26 1:52 ` Chris Ball
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.