Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dc8d68bb authored by Adrian Hunter's avatar Adrian Hunter Committed by Ulf Hansson
Browse files

mmc: core: Remove unused MMC_CAP2_PACKED_CMD 



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

Signed-off-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
Reviewed-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent 082bb85f

drivers/mmc/core/mmc.c

+0 −23
Original line number Original line Diff line number Diff line
@@ -1790,29 +1790,6 @@ static int mmc_init_card(struct mmc_host *host, u32 ocr, 
	 */

	 */

	card->reenable_cmdq = card->ext_csd.cmdq_en;

	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)

	if (!oldcard)

		host->card = card;

		host->card = card;

include/linux/mmc/host.h

+0 −4
Original line number Original line Diff line number Diff line
@@ -291,10 +291,6 @@ struct mmc_host { 
				 MMC_CAP2_HS200_1_2V_SDR)

				 MMC_CAP2_HS200_1_2V_SDR)

#define MMC_CAP2_CD_ACTIVE_HIGH	(1 << 10)	/* Card-detect signal active high */

#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_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_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_8V	(1 << 15)	/* Can support HS400 1.8V */

#define MMC_CAP2_HS400_1_2V	(1 << 16)	/* Can support HS400 1.2V */

#define MMC_CAP2_HS400_1_2V	(1 << 16)	/* Can support HS400 1.2V */