mmc: core: Remove unused MMC_CAP2_PACKED_CMD

Packed commands support was removed but some bits got left behind. Remove
them.

Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c
index a65f56bea4f3b9923d8b3cabd2e980545fa4e0df..a7eb623f8daa3e610891ffb30157dd5e4dd4e103 100644 (file)
--- a/drivers/mmc/core/mmc.c
+++ b/drivers/mmc/core/mmc.c
@@ -1790,29 +1790,6 @@ static int mmc_init_card(struct mmc_host *host, u32 ocr,
         */
        card->reenable_cmdq = card->ext_csd.cmdq_en;
 
-       /*
-        * The mandatory minimum values are defined for packed command.
-        * read: 5, write: 3
-        */
-       if (card->ext_csd.max_packed_writes >= 3 &&
-           card->ext_csd.max_packed_reads >= 5 &&
-           host->caps2 & MMC_CAP2_PACKED_CMD) {
-               err = mmc_switch(card, EXT_CSD_CMD_SET_NORMAL,
-                               EXT_CSD_EXP_EVENTS_CTRL,
-                               EXT_CSD_PACKED_EVENT_EN,
-                               card->ext_csd.generic_cmd6_time);
-               if (err && err != -EBADMSG)
-                       goto free_card;
-               if (err) {
-                       pr_warn("%s: Enabling packed event failed\n",
-                               mmc_hostname(card->host));
-                       card->ext_csd.packed_event_en = 0;
-                       err = 0;
-               } else {
-                       card->ext_csd.packed_event_en = 1;
-               }
-       }
-
        if (!oldcard)
                host->card = card;
 

diff --git a/include/linux/mmc/host.h b/include/linux/mmc/host.h
index 4617c21f97f7907b9225c91777c9178def25912d..e92629518f68c83f84caa7191d9e0a28bf97e3a4 100644 (file)
--- a/include/linux/mmc/host.h
+++ b/include/linux/mmc/host.h
@@ -291,10 +291,6 @@ struct mmc_host {
                                 MMC_CAP2_HS200_1_2V_SDR)
 #define MMC_CAP2_CD_ACTIVE_HIGH        (1 << 10)       /* Card-detect signal active high */
 #define MMC_CAP2_RO_ACTIVE_HIGH        (1 << 11)       /* Write-protect signal active high */
-#define MMC_CAP2_PACKED_RD     (1 << 12)       /* Allow packed read */
-#define MMC_CAP2_PACKED_WR     (1 << 13)       /* Allow packed write */
-#define MMC_CAP2_PACKED_CMD    (MMC_CAP2_PACKED_RD | \
-                                MMC_CAP2_PACKED_WR)
 #define MMC_CAP2_NO_PRESCAN_POWERUP (1 << 14)  /* Don't power up before scan */
 #define MMC_CAP2_HS400_1_8V    (1 << 15)       /* Can support HS400 1.8V */
 #define MMC_CAP2_HS400_1_2V    (1 << 16)       /* Can support HS400 1.2V */