aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>2013-08-08 06:38:42 -0400
committerChris Ball <cjb@laptop.org>2013-08-24 23:58:10 -0400
commit1036563e1417c050993bbd48f20a84ff7c7cef99 (patch)
tree0d9a7ba7d266db2076f65c5dfb93fd9a601440a9
parent57fcb523e5fce1c24e9c28b64f6e6dc3edf55073 (diff)
mmc: sh_mobile_sdhi: 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>
-rw-r--r--drivers/mmc/host/sh_mobile_sdhi.c9
-rw-r--r--include/linux/mmc/sh_mobile_sdhi.h1
2 files changed, 0 insertions, 10 deletions
diff --git a/drivers/mmc/host/sh_mobile_sdhi.c b/drivers/mmc/host/sh_mobile_sdhi.c
index 663a67271670..b3fd2c366678 100644
--- a/drivers/mmc/host/sh_mobile_sdhi.c
+++ b/drivers/mmc/host/sh_mobile_sdhi.c
@@ -70,13 +70,6 @@ static void sh_mobile_sdhi_clk_disable(struct platform_device *pdev)
70 clk_disable(priv->clk); 70 clk_disable(priv->clk);
71} 71}
72 72
73static void sh_mobile_sdhi_set_pwr(struct platform_device *pdev, int state)
74{
75 struct sh_mobile_sdhi_info *p = pdev->dev.platform_data;
76
77 p->set_pwr(pdev, state);
78}
79
80static int sh_mobile_sdhi_wait_idle(struct tmio_mmc_host *host) 73static int sh_mobile_sdhi_wait_idle(struct tmio_mmc_host *host)
81{ 74{
82 int timeout = 1000; 75 int timeout = 1000;
@@ -173,8 +166,6 @@ static int sh_mobile_sdhi_probe(struct platform_device *pdev)
173 mmc_data->capabilities |= p->tmio_caps; 166 mmc_data->capabilities |= p->tmio_caps;
174 mmc_data->capabilities2 |= p->tmio_caps2; 167 mmc_data->capabilities2 |= p->tmio_caps2;
175 mmc_data->cd_gpio = p->cd_gpio; 168 mmc_data->cd_gpio = p->cd_gpio;
176 if (p->set_pwr)
177 mmc_data->set_pwr = sh_mobile_sdhi_set_pwr;
178 169
179 if (p->dma_slave_tx > 0 && p->dma_slave_rx > 0) { 170 if (p->dma_slave_tx > 0 && p->dma_slave_rx > 0) {
180 /* 171 /*
diff --git a/include/linux/mmc/sh_mobile_sdhi.h b/include/linux/mmc/sh_mobile_sdhi.h
index f31c69262232..68927ae50845 100644
--- a/include/linux/mmc/sh_mobile_sdhi.h
+++ b/include/linux/mmc/sh_mobile_sdhi.h
@@ -25,7 +25,6 @@ struct sh_mobile_sdhi_info {
25 unsigned long tmio_caps2; 25 unsigned long tmio_caps2;
26 u32 tmio_ocr_mask; /* available MMC voltages */ 26 u32 tmio_ocr_mask; /* available MMC voltages */
27 unsigned int cd_gpio; 27 unsigned int cd_gpio;
28 void (*set_pwr)(struct platform_device *pdev, int state);
29 28
30 /* callbacks for board specific setup code */ 29 /* callbacks for board specific setup code */
31 int (*init)(struct platform_device *pdev, 30 int (*init)(struct platform_device *pdev,