diff options
| author | Shawn Lin <shawn.lin@rock-chips.com> | 2017-02-15 09:35:30 +0100 |
|---|---|---|
| committer | Ulf Hansson <ulf.hansson@linaro.org> | 2017-02-15 11:34:26 +0100 |
| commit | 1144c1e4ddab9339e262e2702744e8f5c6220824 (patch) | |
| tree | 16d4119214ecb620976d909da79cfb032c1d788d /drivers/mmc | |
| parent | mmc: core: move some sdio IDs out of quirks file (diff) | |
| download | linux-1144c1e4ddab9339e262e2702744e8f5c6220824.tar.xz linux-1144c1e4ddab9339e262e2702744e8f5c6220824.zip | |
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>
Diffstat (limited to 'drivers/mmc')
| -rw-r--r-- | drivers/mmc/core/quirks.h | 6 | ||||
| -rw-r--r-- | drivers/mmc/core/sdio.c | 2 |
2 files changed, 2 insertions, 6 deletions
diff --git a/drivers/mmc/core/quirks.h b/drivers/mmc/core/quirks.h index 074940497686..f6d72173168a 100644 --- 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 f092a55c5064..fae732c870a9 100644 --- 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); |