diff options
| author | Kishon Vijay Abraham I <kishon@ti.com> | 2015-08-27 11:14:07 +0200 |
|---|---|---|
| committer | Ulf Hansson <ulf.hansson@linaro.org> | 2015-08-27 14:54:07 +0200 |
| commit | 987e05c9c3fbffba81104b8ae9a0dde9c73758e9 (patch) | |
| tree | 474869fa60b79c31d2ed9b74d1f3d848a4408a4b /drivers/mmc | |
| parent | mmc: host: omap_hsmmc: use ios->vdd for setting vmmc voltage (diff) | |
| download | linux-987e05c9c3fbffba81104b8ae9a0dde9c73758e9.tar.xz linux-987e05c9c3fbffba81104b8ae9a0dde9c73758e9.zip | |
mmc: host: omap_hsmmc: remove CONFIG_REGULATOR check
Now that support for platforms which have optional regulator is added,
remove CONFIG_REGULATOR check in omap_hsmmc.
Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
Tested-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Diffstat (limited to 'drivers/mmc')
| -rw-r--r-- | drivers/mmc/host/omap_hsmmc.c | 34 |
1 files changed, 3 insertions, 31 deletions
diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c index 58683b3c55b6..781e4db31767 100644 --- a/drivers/mmc/host/omap_hsmmc.c +++ b/drivers/mmc/host/omap_hsmmc.c @@ -244,8 +244,6 @@ static int omap_hsmmc_get_cover_state(struct device *dev) return mmc_gpio_get_cd(host->mmc); } -#ifdef CONFIG_REGULATOR - static int omap_hsmmc_enable_supply(struct mmc_host *mmc) { int ret; @@ -520,30 +518,6 @@ static int omap_hsmmc_reg_get(struct omap_hsmmc_host *host) return 0; } -static inline int omap_hsmmc_have_reg(void) -{ - return 1; -} - -#else - -static int omap_hsmmc_set_power(struct device *dev, int power_on, int vdd) -{ - return 0; -} - -static inline int omap_hsmmc_reg_get(struct omap_hsmmc_host *host) -{ - return -EINVAL; -} - -static inline int omap_hsmmc_have_reg(void) -{ - return 0; -} - -#endif - static irqreturn_t omap_hsmmc_cover_irq(int irq, void *dev_id); static int omap_hsmmc_gpio_init(struct mmc_host *mmc, @@ -2204,11 +2178,9 @@ static int omap_hsmmc_probe(struct platform_device *pdev) goto err_irq; } - if (omap_hsmmc_have_reg()) { - ret = omap_hsmmc_reg_get(host); - if (ret) - goto err_irq; - } + ret = omap_hsmmc_reg_get(host); + if (ret) + goto err_irq; mmc->ocr_avail = mmc_pdata(host)->ocr_mask; |