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

Commit 80d17f3a authored by Balaji T K's avatar Balaji T K Committed by Chris Ball
Browse files

mmc: omap_hsmmc: remove unused .set_sleep function 



set_sleep seems to be unused in omap_hsmmc driver. so get rid of it.

Signed-off-by: default avatarBalaji T K <balajitk@ti.com>
Signed-off-by: default avatarRajendra Nayak <rnayak@ti.com>
Tested-by: default avatarVenkatraman S <svenkatr@ti.com>
Signed-off-by: default avatarChris Ball <cjb@laptop.org>
parent b7bf773b

arch/arm/plat-omap/include/plat/mmc.h

+0 −2
Original line number Original line Diff line number Diff line
@@ -137,8 +137,6 @@ struct omap_mmc_platform_data { 
		int (*set_power)(struct device *dev, int slot,

		int (*set_power)(struct device *dev, int slot,

				 int power_on, int vdd);

				 int power_on, int vdd);

		int (*get_ro)(struct device *dev, int slot);

		int (*get_ro)(struct device *dev, int slot);

		int (*set_sleep)(struct device *dev, int slot, int sleep,

				 int vdd, int cardsleep);

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

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

		/* Call back before enabling / disabling regulators */

		/* Call back before enabling / disabling regulators */

		void (*before_set_reg)(struct device *dev, int slot,

		void (*before_set_reg)(struct device *dev, int slot,

drivers/mmc/host/omap_hsmmc.c

+0 −60
Original line number Original line Diff line number Diff line
@@ -324,61 +324,6 @@ static int omap_hsmmc_4_set_power(struct device *dev, int slot, int power_on, 
	return 0;

	return 0;

}

}





static int omap_hsmmc_1_set_sleep(struct device *dev, int slot, int sleep,

				  int vdd, int cardsleep)

{

	struct omap_hsmmc_host *host =

		platform_get_drvdata(to_platform_device(dev));

	int mode = sleep ? REGULATOR_MODE_STANDBY : REGULATOR_MODE_NORMAL;



	return regulator_set_mode(host->vcc, mode);

}



static int omap_hsmmc_235_set_sleep(struct device *dev, int slot, int sleep,

				   int vdd, int cardsleep)

{

	struct omap_hsmmc_host *host =

		platform_get_drvdata(to_platform_device(dev));

	int err, mode;



	/*

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

	 * voltage always-on regulator.

	 */

	if (!host->vcc)

		return 0;



	mode = sleep ? REGULATOR_MODE_STANDBY : REGULATOR_MODE_NORMAL;



	if (!host->vcc_aux)

		return regulator_set_mode(host->vcc, mode);



	if (cardsleep) {

		/* VCC can be turned off if card is asleep */

		if (sleep)

			err = mmc_regulator_set_ocr(host->mmc, host->vcc, 0);

		else

			err = mmc_regulator_set_ocr(host->mmc, host->vcc, vdd);

	} else

		err = regulator_set_mode(host->vcc, mode);

	if (err)

		return err;



	if (!mmc_slot(host).vcc_aux_disable_is_sleep)

		return regulator_set_mode(host->vcc_aux, mode);



	if (sleep)

		return regulator_disable(host->vcc_aux);

	else

		return regulator_enable(host->vcc_aux);

}



static int omap_hsmmc_4_set_sleep(struct device *dev, int slot, int sleep,

					int vdd, int cardsleep)

{

	return 0;

}



static int omap_hsmmc_reg_get(struct omap_hsmmc_host *host)

static int omap_hsmmc_reg_get(struct omap_hsmmc_host *host)

{

{

	struct regulator *reg;

	struct regulator *reg;
@@ -389,18 +334,15 @@ static int omap_hsmmc_reg_get(struct omap_hsmmc_host *host) 
	case OMAP_MMC1_DEVID:

	case OMAP_MMC1_DEVID:

		/* On-chip level shifting via PBIAS0/PBIAS1 */

		/* On-chip level shifting via PBIAS0/PBIAS1 */

		mmc_slot(host).set_power = omap_hsmmc_1_set_power;

		mmc_slot(host).set_power = omap_hsmmc_1_set_power;

		mmc_slot(host).set_sleep = omap_hsmmc_1_set_sleep;

		break;

		break;

	case OMAP_MMC2_DEVID:

	case OMAP_MMC2_DEVID:

	case OMAP_MMC3_DEVID:

	case OMAP_MMC3_DEVID:

	case OMAP_MMC5_DEVID:

	case OMAP_MMC5_DEVID:

		/* Off-chip level shifting, or none */

		/* Off-chip level shifting, or none */

		mmc_slot(host).set_power = omap_hsmmc_235_set_power;

		mmc_slot(host).set_power = omap_hsmmc_235_set_power;

		mmc_slot(host).set_sleep = omap_hsmmc_235_set_sleep;

		break;

		break;

	case OMAP_MMC4_DEVID:

	case OMAP_MMC4_DEVID:

		mmc_slot(host).set_power = omap_hsmmc_4_set_power;

		mmc_slot(host).set_power = omap_hsmmc_4_set_power;

		mmc_slot(host).set_sleep = omap_hsmmc_4_set_sleep;

	default:

	default:

		pr_err("MMC%d configuration not supported!\n", host->id);

		pr_err("MMC%d configuration not supported!\n", host->id);

		return -EINVAL;

		return -EINVAL;
@@ -462,7 +404,6 @@ static int omap_hsmmc_reg_get(struct omap_hsmmc_host *host) 




err:

err:

	mmc_slot(host).set_power = NULL;

	mmc_slot(host).set_power = NULL;

	mmc_slot(host).set_sleep = NULL;

	return ret;

	return ret;

}

}
@@ -471,7 +412,6 @@ static void omap_hsmmc_reg_put(struct omap_hsmmc_host *host) 
	regulator_put(host->vcc);

	regulator_put(host->vcc);

	regulator_put(host->vcc_aux);

	regulator_put(host->vcc_aux);

	mmc_slot(host).set_power = NULL;

	mmc_slot(host).set_power = NULL;

	mmc_slot(host).set_sleep = NULL;

}

}





static inline int omap_hsmmc_have_reg(void)

static inline int omap_hsmmc_have_reg(void)