aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mmc
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2014-04-25 07:59:51 -0400
committerChris Ball <chris@printf.net>2014-05-22 08:33:28 -0400
commitc314b2b10b4c76f1280675ca0b071a1d8ee65f68 (patch)
tree641c99ba4283f013655aa9dff2999db227fc8670 /drivers/mmc
parent723f7924e80e97e365e70206b6f6f5ebdd8e7ccf (diff)
mmc: sdhci: remove platform_suspend/platform_resume callbacks
The only user (sdhci-of-esdhc) no longer uses these callbacks, so lets remove them to discourage any further use. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> Tested-by: Markus Pargmann <mpa@pengutronix.de> Tested-by: Stephen Warren <swarren@nvidia.com> Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org> Signed-off-by: Chris Ball <chris@printf.net>
Diffstat (limited to 'drivers/mmc')
-rw-r--r--drivers/mmc/host/sdhci.c6
-rw-r--r--drivers/mmc/host/sdhci.h2
2 files changed, 0 insertions, 8 deletions
diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
index 5c8b192c4c3e..7368d3992ad4 100644
--- a/drivers/mmc/host/sdhci.c
+++ b/drivers/mmc/host/sdhci.c
@@ -2547,9 +2547,6 @@ EXPORT_SYMBOL_GPL(sdhci_disable_irq_wakeups);
2547 2547
2548int sdhci_suspend_host(struct sdhci_host *host) 2548int sdhci_suspend_host(struct sdhci_host *host)
2549{ 2549{
2550 if (host->ops->platform_suspend)
2551 host->ops->platform_suspend(host);
2552
2553 sdhci_disable_card_detection(host); 2550 sdhci_disable_card_detection(host);
2554 2551
2555 /* Disable tuning since we are suspending */ 2552 /* Disable tuning since we are suspending */
@@ -2606,9 +2603,6 @@ int sdhci_resume_host(struct sdhci_host *host)
2606 2603
2607 sdhci_enable_card_detection(host); 2604 sdhci_enable_card_detection(host);
2608 2605
2609 if (host->ops->platform_resume)
2610 host->ops->platform_resume(host);
2611
2612 /* Set the re-tuning expiration flag */ 2606 /* Set the re-tuning expiration flag */
2613 if (host->flags & SDHCI_USING_RETUNING_TIMER) 2607 if (host->flags & SDHCI_USING_RETUNING_TIMER)
2614 host->flags |= SDHCI_NEEDS_RETUNING; 2608 host->flags |= SDHCI_NEEDS_RETUNING;
diff --git a/drivers/mmc/host/sdhci.h b/drivers/mmc/host/sdhci.h
index 7a35395e5f56..4a5cd5e3fa3e 100644
--- a/drivers/mmc/host/sdhci.h
+++ b/drivers/mmc/host/sdhci.h
@@ -289,8 +289,6 @@ struct sdhci_ops {
289 int (*platform_execute_tuning)(struct sdhci_host *host, u32 opcode); 289 int (*platform_execute_tuning)(struct sdhci_host *host, u32 opcode);
290 void (*set_uhs_signaling)(struct sdhci_host *host, unsigned int uhs); 290 void (*set_uhs_signaling)(struct sdhci_host *host, unsigned int uhs);
291 void (*hw_reset)(struct sdhci_host *host); 291 void (*hw_reset)(struct sdhci_host *host);
292 void (*platform_suspend)(struct sdhci_host *host);
293 void (*platform_resume)(struct sdhci_host *host);
294 void (*adma_workaround)(struct sdhci_host *host, u32 intmask); 292 void (*adma_workaround)(struct sdhci_host *host, u32 intmask);
295 void (*platform_init)(struct sdhci_host *host); 293 void (*platform_init)(struct sdhci_host *host);
296 void (*card_event)(struct sdhci_host *host); 294 void (*card_event)(struct sdhci_host *host);