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

Commit 29495aa0 authored by Manuel Lauss's avatar Manuel Lauss Committed by Chris Ball
Browse files

mmc: sdhci: remove "state" argument from sdhci_suspend_host 



Drop the "state" argument from sdhci_suspend_host.  Its only user is the
PCI glue;  this allows to move all SDHCI glues to use dev_pm_ops instead.

Signed-off-by: default avatarManuel Lauss <manuel.lauss@googlemail.com>
Acked-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
Signed-off-by: default avatarChris Ball <cjb@laptop.org>
parent 49df7807

drivers/mmc/host/sdhci-cns3xxx.c

+1 −4
Original line number Diff line number Diff line
@@ -109,13 +109,10 @@ static struct platform_driver sdhci_cns3xxx_driver = { 
	.driver		= {

		.name	= "sdhci-cns3xxx",

		.owner	= THIS_MODULE,

		.pm	= SDHCI_PLTFM_PMOPS,

	},

	.probe		= sdhci_cns3xxx_probe,

	.remove		= __devexit_p(sdhci_cns3xxx_remove),

#ifdef CONFIG_PM

	.suspend	= sdhci_pltfm_suspend,

	.resume		= sdhci_pltfm_resume,

#endif

};



static int __init sdhci_cns3xxx_init(void)

drivers/mmc/host/sdhci-dove.c

+1 −4
Original line number Diff line number Diff line
@@ -82,13 +82,10 @@ static struct platform_driver sdhci_dove_driver = { 
	.driver		= {

		.name	= "sdhci-dove",

		.owner	= THIS_MODULE,

		.pm	= SDHCI_PLTFM_PMOPS,

	},

	.probe		= sdhci_dove_probe,

	.remove		= __devexit_p(sdhci_dove_remove),

#ifdef CONFIG_PM

	.suspend	= sdhci_pltfm_suspend,

	.resume		= sdhci_pltfm_resume,

#endif

};



static int __init sdhci_dove_init(void)

drivers/mmc/host/sdhci-esdhc-imx.c

+1 −4
Original line number Diff line number Diff line
@@ -599,14 +599,11 @@ static struct platform_driver sdhci_esdhc_imx_driver = { 
		.name	= "sdhci-esdhc-imx",

		.owner	= THIS_MODULE,

		.of_match_table = imx_esdhc_dt_ids,

		.pm	= SDHCI_PLTFM_PMOPS,

	},

	.id_table	= imx_esdhc_devtype,

	.probe		= sdhci_esdhc_imx_probe,

	.remove		= __devexit_p(sdhci_esdhc_imx_remove),

#ifdef CONFIG_PM

	.suspend	= sdhci_pltfm_suspend,

	.resume		= sdhci_pltfm_resume,

#endif

};



static int __init sdhci_esdhc_imx_init(void)

drivers/mmc/host/sdhci-of-esdhc.c

+1 −4
Original line number Diff line number Diff line
@@ -125,13 +125,10 @@ static struct platform_driver sdhci_esdhc_driver = { 
		.name = "sdhci-esdhc",

		.owner = THIS_MODULE,

		.of_match_table = sdhci_esdhc_of_match,

		.pm = SDHCI_PLTFM_PMOPS,

	},

	.probe = sdhci_esdhc_probe,

	.remove = __devexit_p(sdhci_esdhc_remove),

#ifdef CONFIG_PM

	.suspend = sdhci_pltfm_suspend,

	.resume = sdhci_pltfm_resume,

#endif

};



static int __init sdhci_esdhc_init(void)

drivers/mmc/host/sdhci-of-hlwd.c

+1 −4
Original line number Diff line number Diff line
@@ -87,13 +87,10 @@ static struct platform_driver sdhci_hlwd_driver = { 
		.name = "sdhci-hlwd",

		.owner = THIS_MODULE,

		.of_match_table = sdhci_hlwd_of_match,

		.pm = SDHCI_PLTFM_PMOPS,

	},

	.probe = sdhci_hlwd_probe,

	.remove = __devexit_p(sdhci_hlwd_remove),

#ifdef CONFIG_PM

	.suspend = sdhci_pltfm_suspend,

	.resume = sdhci_pltfm_resume,

#endif

};



static int __init sdhci_hlwd_init(void)