[PATCH 28/38] mmc: sdhci: remove platform_suspend/platform_resume callbacks

Ulf Hansson ulf.hansson at linaro.org
Thu Apr 24 00:33:40 PDT 2014


On 23 April 2014 21:08, Russell King <rmk+kernel at arm.linux.org.uk> wrote:
> 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 at arm.linux.org.uk>

Acked-by: Ulf Hansson <ulf.hansson at linaro.org>

> ---
>  drivers/mmc/host/sdhci.c | 6 ------
>  drivers/mmc/host/sdhci.h | 2 --
>  2 files changed, 8 deletions(-)
>
> diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
> index c1bd77e17458..f9bca1e7da25 100644
> --- a/drivers/mmc/host/sdhci.c
> +++ b/drivers/mmc/host/sdhci.c
> @@ -2530,9 +2530,6 @@ EXPORT_SYMBOL_GPL(sdhci_disable_irq_wakeups);
>
>  int sdhci_suspend_host(struct sdhci_host *host)
>  {
> -       if (host->ops->platform_suspend)
> -               host->ops->platform_suspend(host);
> -
>         sdhci_disable_card_detection(host);
>
>         /* Disable tuning since we are suspending */
> @@ -2589,9 +2586,6 @@ int sdhci_resume_host(struct sdhci_host *host)
>
>         sdhci_enable_card_detection(host);
>
> -       if (host->ops->platform_resume)
> -               host->ops->platform_resume(host);
> -
>         /* Set the re-tuning expiration flag */
>         if (host->flags & SDHCI_USING_RETUNING_TIMER)
>                 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 {
>         int     (*platform_execute_tuning)(struct sdhci_host *host, u32 opcode);
>         void    (*set_uhs_signaling)(struct sdhci_host *host, unsigned int uhs);
>         void    (*hw_reset)(struct sdhci_host *host);
> -       void    (*platform_suspend)(struct sdhci_host *host);
> -       void    (*platform_resume)(struct sdhci_host *host);
>         void    (*adma_workaround)(struct sdhci_host *host, u32 intmask);
>         void    (*platform_init)(struct sdhci_host *host);
>         void    (*card_event)(struct sdhci_host *host);
> --
> 1.8.3.1
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-mmc" in
> the body of a message to majordomo at vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html



More information about the linux-arm-kernel mailing list