| From 79102b5faa1725f10b51df9a107ec572b1d04b09 Mon Sep 17 00:00:00 2001 |
| From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> |
| Date: Thu, 8 Aug 2013 12:38:40 +0200 |
| Subject: 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> |
| (cherry picked from commit 83a0c7797e96e103bb3b6fcf8afb7b65dc7fc68e) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| drivers/mmc/host/sh_mmcif.c | 3 --- |
| include/linux/mmc/sh_mmcif.h | 1 - |
| 2 files changed, 4 deletions(-) |
| |
| diff --git a/drivers/mmc/host/sh_mmcif.c b/drivers/mmc/host/sh_mmcif.c |
| index 6f9834fd..a973d785 100644 |
| --- a/drivers/mmc/host/sh_mmcif.c |
| +++ b/drivers/mmc/host/sh_mmcif.c |
| @@ -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, |
| diff --git a/include/linux/mmc/sh_mmcif.h b/include/linux/mmc/sh_mmcif.h |
| index 39011eb4..767fac5a 100644 |
| --- a/include/linux/mmc/sh_mmcif.h |
| +++ b/include/linux/mmc/sh_mmcif.h |
| @@ -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; |
| -- |
| 1.8.4.3.gca3854a |
| |
