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

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

mmc: core: Simplify card drive strength mask 



Card drive strength selection uses a callback to
which a mask of supported drive strengths is passed.
Currently, the bits are checked against the values
in the SD specifications. That is not necessary
because the callback will anyway match the mask
against a valid value. Simplify by taking the mask
as is but still ensuring that the default mandatory
value (type B) is always supported.

Signed-off-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent b4f30a17

drivers/mmc/core/sd.c

+2 −10
Original line number Diff line number Diff line
@@ -387,8 +387,7 @@ int mmc_sd_switch_hs(struct mmc_card *card) 
static int sd_select_driver_type(struct mmc_card *card, u8 *status)

{

	int host_drv_type = SD_DRIVER_TYPE_B;

	int card_drv_type = SD_DRIVER_TYPE_B;

	int drive_strength, drv_type;

	int card_drv_type, drive_strength, drv_type;

	int err;



	if (!card->host->ops->select_drive_strength)
@@ -403,14 +402,7 @@ static int sd_select_driver_type(struct mmc_card *card, u8 *status) 
	if (card->host->caps & MMC_CAP_DRIVER_TYPE_D)

		host_drv_type |= SD_DRIVER_TYPE_D;



	if (card->sw_caps.sd3_drv_type & SD_DRIVER_TYPE_A)

		card_drv_type |= SD_DRIVER_TYPE_A;



	if (card->sw_caps.sd3_drv_type & SD_DRIVER_TYPE_C)

		card_drv_type |= SD_DRIVER_TYPE_C;



	if (card->sw_caps.sd3_drv_type & SD_DRIVER_TYPE_D)

		card_drv_type |= SD_DRIVER_TYPE_D;

	card_drv_type = card->sw_caps.sd3_drv_type | SD_DRIVER_TYPE_B;



	/*

	 * The drive strength that the hardware can support

drivers/mmc/core/sdio.c

+2 −10
Original line number Diff line number Diff line
@@ -403,8 +403,7 @@ static unsigned char host_drive_to_sdio_drive(int host_strength) 
static void sdio_select_driver_type(struct mmc_card *card)

{

	int host_drv_type = SD_DRIVER_TYPE_B;

	int card_drv_type = SD_DRIVER_TYPE_B;

	int drive_strength, drv_type;

	int card_drv_type, drive_strength, drv_type;

	unsigned char card_strength;

	int err;
@@ -420,14 +419,7 @@ static void sdio_select_driver_type(struct mmc_card *card) 
	if (card->host->caps & MMC_CAP_DRIVER_TYPE_D)

		host_drv_type |= SD_DRIVER_TYPE_D;



	if (card->sw_caps.sd3_drv_type & SD_DRIVER_TYPE_A)

		card_drv_type |= SD_DRIVER_TYPE_A;



	if (card->sw_caps.sd3_drv_type & SD_DRIVER_TYPE_C)

		card_drv_type |= SD_DRIVER_TYPE_C;



	if (card->sw_caps.sd3_drv_type & SD_DRIVER_TYPE_D)

		card_drv_type |= SD_DRIVER_TYPE_D;

	card_drv_type = card->sw_caps.sd3_drv_type | SD_DRIVER_TYPE_B;



	/*

	 * The drive strength that the hardware can support