mmc: core: improve the quirks for sdio devices

Rename mmc_fixup_methods to sdio_fixup_methods to better
reflect that it's for sdio devices. So we could also pass
on it from sdio card's probe sequence just like what we do
for eMMC and block there.

Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

diff --git a/drivers/mmc/core/quirks.h b/drivers/mmc/core/quirks.h
index 0749404976861b049128ea5dac80f9f116f555bf..f6d72173168ac2e6668666e61ff9574910c2e056 100644 (file)
--- a/drivers/mmc/core/quirks.h
+++ b/drivers/mmc/core/quirks.h
@@ -13,7 +13,7 @@
 
 #include "card.h"
 
-static const struct mmc_fixup mmc_fixup_methods[] = {
+static const struct mmc_fixup sdio_fixup_methods[] = {
        SDIO_FIXUP(SDIO_VENDOR_ID_TI, SDIO_DEVICE_ID_TI_WL1271,
                   add_quirk, MMC_QUIRK_NONSTD_FUNC_IF),
 
@@ -35,10 +35,6 @@ static inline void mmc_fixup_device(struct mmc_card *card,
        const struct mmc_fixup *f;
        u64 rev = cid_rev_card(card);
 
-       /* Non-core specific workarounds. */
-       if (!table)
-               table = mmc_fixup_methods;
-
        for (f = table; f->vendor_fixup; f++) {
                if ((f->manfid == CID_MANFID_ANY ||
                     f->manfid == card->cid.manfid) &&

diff --git a/drivers/mmc/core/sdio.c b/drivers/mmc/core/sdio.c
index f092a55c5064b9905fc4c69aa9b8ab6abe8ba787..fae732c870a961ffd001627307ac37433cd23215 100644 (file)
--- a/drivers/mmc/core/sdio.c
+++ b/drivers/mmc/core/sdio.c
@@ -739,7 +739,7 @@ try_again:
                card = oldcard;
        }
        card->ocr = ocr_card;
-       mmc_fixup_device(card, NULL);
+       mmc_fixup_device(card, sdio_fixup_methods);
 
        if (card->type == MMC_TYPE_SD_COMBO) {
                err = mmc_sd_setup_card(host, card, oldcard != NULL);