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

Commit 987e05c9 authored by Kishon Vijay Abraham I's avatar Kishon Vijay Abraham I Committed by Ulf Hansson
Browse files

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: default avatarKishon Vijay Abraham I <kishon@ti.com>
Tested-by: default avatarTony Lindgren <tony@atomide.com>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent 1d17f30b

drivers/mmc/host/omap_hsmmc.c

+3 −31
Original line number Diff line number Diff line
@@ -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;

	}



	mmc->ocr_avail = mmc_pdata(host)->ocr_mask;