Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia

[firefly-linux-kernel-4.4.55.git] / drivers / mmc / host / dw_mmc.h

diff --git a/drivers/mmc/host/dw_mmc.h b/drivers/mmc/host/dw_mmc.h
index f45ab91de33946ac86abc72ae8305eb1f18aa55e..8ce4674730a6ff8efde66e456136aa0d282e06c5 100644 (file)
--- a/drivers/mmc/host/dw_mmc.h
+++ b/drivers/mmc/host/dw_mmc.h
@@ -227,7 +227,6 @@ extern int dw_mci_resume(struct dw_mci *host);
  * struct dw_mci_slot - MMC slot state
  * @mmc: The mmc_host representing this slot.
  * @host: The MMC controller this slot is using.
- * @quirks: Slot-level quirks (DW_MCI_SLOT_QUIRK_XXX)
  * @ctype: Card type for this slot.
  * @mrq: mmc_request currently being processed or waiting to be
  *     processed, or NULL when the slot is idle.
@@ -245,8 +244,6 @@ struct dw_mci_slot {
        struct mmc_host         *mmc;
        struct dw_mci           *host;
 
-       int                     quirks;
-
        u32                     ctype;
 
        struct mmc_request      *mrq;
@@ -287,5 +284,7 @@ struct dw_mci_drv_data {
        int             (*execute_tuning)(struct dw_mci_slot *slot);
        int             (*prepare_hs400_tuning)(struct dw_mci *host,
                                                struct mmc_ios *ios);
+       int             (*switch_voltage)(struct mmc_host *mmc,
+                                         struct mmc_ios *ios);
 };
 #endif /* _DW_MMC_H_ */