diff options
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/mmc/core/sd.c | 12 | ||||
| -rw-r--r-- | drivers/mmc/core/sdio.c | 12 |
2 files changed, 4 insertions, 20 deletions
diff --git a/drivers/mmc/core/sd.c b/drivers/mmc/core/sd.c index 5edd7d8b033e..9b72ea6b3177 100644 --- a/drivers/mmc/core/sd.c +++ b/drivers/mmc/core/sd.c @@ -387,8 +387,7 @@ out: 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 diff --git a/drivers/mmc/core/sdio.c b/drivers/mmc/core/sdio.c index 9d87aeb7c752..ef82f3d029e8 100644 --- a/drivers/mmc/core/sdio.c +++ b/drivers/mmc/core/sdio.c @@ -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 |