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

Commit 36acbd9e authored by Faiz Abbas's avatar Faiz Abbas Committed by Ulf Hansson
Browse files

mmc: host: omap_hsmmc: remove unused platform callbacks 



Remove unused callbacks in the omap_hsmmc_platform_data structure

Signed-off-by: default avatarFaiz Abbas <faiz_abbas@ti.com>
Acked-by: default avatarTony Lindgren <tony@atomide.com>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent ba64792f

drivers/mmc/host/omap_hsmmc.c

+0 −11
Original line number Diff line number Diff line
@@ -356,9 +356,6 @@ static int omap_hsmmc_set_power(struct omap_hsmmc_host *host, int power_on, 
	struct mmc_host *mmc = host->mmc;

	int ret = 0;



	if (mmc_pdata(host)->set_power)

		return mmc_pdata(host)->set_power(host->dev, power_on, vdd);



	/*

	 * If we don't see a Vcc regulator, assume it's a fixed

	 * voltage always-on regulator.
@@ -366,9 +363,6 @@ static int omap_hsmmc_set_power(struct omap_hsmmc_host *host, int power_on, 
	if (IS_ERR(mmc->supply.vmmc))

		return 0;



	if (mmc_pdata(host)->before_set_reg)

		mmc_pdata(host)->before_set_reg(host->dev, power_on, vdd);



	ret = omap_hsmmc_set_pbias(host, false, 0);

	if (ret)

		return ret;
@@ -400,9 +394,6 @@ static int omap_hsmmc_set_power(struct omap_hsmmc_host *host, int power_on, 
			return ret;

	}



	if (mmc_pdata(host)->after_set_reg)

		mmc_pdata(host)->after_set_reg(host->dev, power_on, vdd);



	return 0;



err_set_voltage:
@@ -469,8 +460,6 @@ static int omap_hsmmc_reg_get(struct omap_hsmmc_host *host) 
	int ret;

	struct mmc_host *mmc = host->mmc;



	if (mmc_pdata(host)->set_power)

		return 0;



	ret = mmc_regulator_get_supply(mmc);

	if (ret == -EPROBE_DEFER)

include/linux/platform_data/hsmmc-omap.h

+0 −10
Original line number Diff line number Diff line
@@ -55,9 +55,6 @@ struct omap_hsmmc_platform_data { 
	u32 caps;	/* Used for the MMC driver on 2430 and later */

	u32 pm_caps;	/* PM capabilities of the mmc */



	/* use the internal clock */

	unsigned internal_clock:1;



	/* nonremovable e.g. eMMC */

	unsigned nonremovable:1;
@@ -73,13 +70,6 @@ struct omap_hsmmc_platform_data { 
	int gpio_cd;			/* gpio (card detect) */

	int gpio_cod;			/* gpio (cover detect) */

	int gpio_wp;			/* gpio (write protect) */



	int (*set_power)(struct device *dev, int power_on, int vdd);

	void (*remux)(struct device *dev, int power_on);

	/* Call back before enabling / disabling regulators */

	void (*before_set_reg)(struct device *dev, int power_on, int vdd);

	/* Call back after enabling / disabling regulators */

	void (*after_set_reg)(struct device *dev, int power_on, int vdd);

	/* if we have special card, init it using this callback */

	void (*init_card)(struct mmc_card *card);