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

Commit 83a0c779 authored Aug 08, 2013 by Laurent Pinchart Committed by Chris Ball Aug 24, 2013

mmc: sh_mmcif: Remove .set_pwr() callback from platform data



The .set_pwr() callback isn't used anymore as all platforms register
GPIO-controlled regulators. Remove it.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Acked-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Chris Ball <cjb@laptop.org>

parent dcbfaf36

drivers/mmc/host/sh_mmcif.c

+0 −3

Original line number	Diff line number	Diff line
		@@ -956,11 +956,8 @@ static int sh_mmcif_clk_update(struct sh_mmcif_host *host)

		static void sh_mmcif_set_power(struct sh_mmcif_host host, struct mmc_ios ios)
		{
		struct sh_mmcif_plat_data *pd = host->pd->dev.platform_data;
		struct mmc_host *mmc = host->mmc;

		if (pd && pd->set_pwr)
		pd->set_pwr(host->pd, ios->power_mode != MMC_POWER_OFF);
		if (!IS_ERR(mmc->supply.vmmc))
		/* Errors ignored... */
		mmc_regulator_set_ocr(mmc, mmc->supply.vmmc,

include/linux/mmc/sh_mmcif.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -33,7 +33,6 @@
		*/

		struct sh_mmcif_plat_data {
		void (set_pwr)(struct platform_device pdev, int state);
		int (get_cd)(struct platform_device pdef);
		unsigned int slave_id_tx; /* embedded slave_id_[tr]x */
		unsigned int slave_id_rx;