diff options
author | Adrian Hunter <adrian.hunter@intel.com> | 2015-02-06 15:12:55 +0300 |
---|---|---|
committer | Ulf Hansson <ulf.hansson@linaro.org> | 2015-06-01 10:07:12 +0300 |
commit | e23350b35deb77ef8e33c35dbb0ed1dab9e8ab86 (patch) | |
tree | 29cc97e17338d483ecb47bb8ed075107d154164a /drivers/mmc/core/sdio.c | |
parent | f168359efbb99d6f8591bb666d6510bb78df2d07 (diff) | |
download | linux-e23350b35deb77ef8e33c35dbb0ed1dab9e8ab86.tar.xz |
mmc: core: Factor out common code in drive strength selection
Make a new function out of common code used for drive
strength selection.
Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Diffstat (limited to 'drivers/mmc/core/sdio.c')
-rw-r--r-- | drivers/mmc/core/sdio.c | 25 |
1 files changed, 3 insertions, 22 deletions
diff --git a/drivers/mmc/core/sdio.c b/drivers/mmc/core/sdio.c index d3d13047f316..73b091331c96 100644 --- a/drivers/mmc/core/sdio.c +++ b/drivers/mmc/core/sdio.c @@ -402,34 +402,15 @@ 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, drive_strength, drv_type; unsigned char card_strength; int err; - if (!card->host->ops->select_drive_strength) - return; - - if (card->host->caps & MMC_CAP_DRIVER_TYPE_A) - host_drv_type |= SD_DRIVER_TYPE_A; - - if (card->host->caps & MMC_CAP_DRIVER_TYPE_C) - host_drv_type |= SD_DRIVER_TYPE_C; - - if (card->host->caps & MMC_CAP_DRIVER_TYPE_D) - host_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 - * depends on the board design. Pass the appropriate - * information and let the hardware specific code - * return what is possible given the options - */ - drive_strength = card->host->ops->select_drive_strength(card, - card->sw_caps.uhs_max_dtr, - host_drv_type, card_drv_type, &drv_type); + drive_strength = mmc_select_drive_strength(card, + card->sw_caps.uhs_max_dtr, + card_drv_type, &drv_type); if (drive_strength) { /* if error just use default for drive strength B */ |