Commit caebcae9 authored by Kevin Hao's avatar Kevin Hao Committed by Ulf Hansson

mmc: sdhci: set the .remove to sdhci_pltfm_unregister()

In these drivers, the driver specific .remove function just a simple
wrapper of function sdhci_pltfm_unregister(). So remove these wrappers
and just set .remove to sdhci_pltfm_unregister().
Signed-off-by: default avatarKevin Hao <haokexin@gmail.com>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent 83eacdfa
...@@ -323,11 +323,6 @@ static int sdhci_bcm_kona_probe(struct platform_device *pdev) ...@@ -323,11 +323,6 @@ static int sdhci_bcm_kona_probe(struct platform_device *pdev)
return ret; return ret;
} }
static int sdhci_bcm_kona_remove(struct platform_device *pdev)
{
return sdhci_pltfm_unregister(pdev);
}
static struct platform_driver sdhci_bcm_kona_driver = { static struct platform_driver sdhci_bcm_kona_driver = {
.driver = { .driver = {
.name = "sdhci-kona", .name = "sdhci-kona",
...@@ -335,7 +330,7 @@ static struct platform_driver sdhci_bcm_kona_driver = { ...@@ -335,7 +330,7 @@ static struct platform_driver sdhci_bcm_kona_driver = {
.of_match_table = sdhci_bcm_kona_of_match, .of_match_table = sdhci_bcm_kona_of_match,
}, },
.probe = sdhci_bcm_kona_probe, .probe = sdhci_bcm_kona_probe,
.remove = sdhci_bcm_kona_remove, .remove = sdhci_pltfm_unregister,
}; };
module_platform_driver(sdhci_bcm_kona_driver); module_platform_driver(sdhci_bcm_kona_driver);
......
...@@ -180,11 +180,6 @@ static int bcm2835_sdhci_probe(struct platform_device *pdev) ...@@ -180,11 +180,6 @@ static int bcm2835_sdhci_probe(struct platform_device *pdev)
return ret; return ret;
} }
static int bcm2835_sdhci_remove(struct platform_device *pdev)
{
return sdhci_pltfm_unregister(pdev);
}
static const struct of_device_id bcm2835_sdhci_of_match[] = { static const struct of_device_id bcm2835_sdhci_of_match[] = {
{ .compatible = "brcm,bcm2835-sdhci" }, { .compatible = "brcm,bcm2835-sdhci" },
{ } { }
...@@ -198,7 +193,7 @@ static struct platform_driver bcm2835_sdhci_driver = { ...@@ -198,7 +193,7 @@ static struct platform_driver bcm2835_sdhci_driver = {
.pm = SDHCI_PLTFM_PMOPS, .pm = SDHCI_PLTFM_PMOPS,
}, },
.probe = bcm2835_sdhci_probe, .probe = bcm2835_sdhci_probe,
.remove = bcm2835_sdhci_remove, .remove = sdhci_pltfm_unregister,
}; };
module_platform_driver(bcm2835_sdhci_driver); module_platform_driver(bcm2835_sdhci_driver);
......
...@@ -98,18 +98,13 @@ static int sdhci_cns3xxx_probe(struct platform_device *pdev) ...@@ -98,18 +98,13 @@ static int sdhci_cns3xxx_probe(struct platform_device *pdev)
return sdhci_pltfm_register(pdev, &sdhci_cns3xxx_pdata, 0); return sdhci_pltfm_register(pdev, &sdhci_cns3xxx_pdata, 0);
} }
static int sdhci_cns3xxx_remove(struct platform_device *pdev)
{
return sdhci_pltfm_unregister(pdev);
}
static struct platform_driver sdhci_cns3xxx_driver = { static struct platform_driver sdhci_cns3xxx_driver = {
.driver = { .driver = {
.name = "sdhci-cns3xxx", .name = "sdhci-cns3xxx",
.pm = SDHCI_PLTFM_PMOPS, .pm = SDHCI_PLTFM_PMOPS,
}, },
.probe = sdhci_cns3xxx_probe, .probe = sdhci_cns3xxx_probe,
.remove = sdhci_cns3xxx_remove, .remove = sdhci_pltfm_unregister,
}; };
module_platform_driver(sdhci_cns3xxx_driver); module_platform_driver(sdhci_cns3xxx_driver);
......
...@@ -108,11 +108,6 @@ static int sdhci_dove_probe(struct platform_device *pdev) ...@@ -108,11 +108,6 @@ static int sdhci_dove_probe(struct platform_device *pdev)
return ret; return ret;
} }
static int sdhci_dove_remove(struct platform_device *pdev)
{
return sdhci_pltfm_unregister(pdev);
}
static const struct of_device_id sdhci_dove_of_match_table[] = { static const struct of_device_id sdhci_dove_of_match_table[] = {
{ .compatible = "marvell,dove-sdhci", }, { .compatible = "marvell,dove-sdhci", },
{} {}
...@@ -126,7 +121,7 @@ static struct platform_driver sdhci_dove_driver = { ...@@ -126,7 +121,7 @@ static struct platform_driver sdhci_dove_driver = {
.of_match_table = sdhci_dove_of_match_table, .of_match_table = sdhci_dove_of_match_table,
}, },
.probe = sdhci_dove_probe, .probe = sdhci_dove_probe,
.remove = sdhci_dove_remove, .remove = sdhci_pltfm_unregister,
}; };
module_platform_driver(sdhci_dove_driver); module_platform_driver(sdhci_dove_driver);
......
...@@ -386,11 +386,6 @@ static int sdhci_esdhc_probe(struct platform_device *pdev) ...@@ -386,11 +386,6 @@ static int sdhci_esdhc_probe(struct platform_device *pdev)
return ret; return ret;
} }
static int sdhci_esdhc_remove(struct platform_device *pdev)
{
return sdhci_pltfm_unregister(pdev);
}
static const struct of_device_id sdhci_esdhc_of_match[] = { static const struct of_device_id sdhci_esdhc_of_match[] = {
{ .compatible = "fsl,mpc8379-esdhc" }, { .compatible = "fsl,mpc8379-esdhc" },
{ .compatible = "fsl,mpc8536-esdhc" }, { .compatible = "fsl,mpc8536-esdhc" },
...@@ -406,7 +401,7 @@ static struct platform_driver sdhci_esdhc_driver = { ...@@ -406,7 +401,7 @@ static struct platform_driver sdhci_esdhc_driver = {
.pm = ESDHC_PMOPS, .pm = ESDHC_PMOPS,
}, },
.probe = sdhci_esdhc_probe, .probe = sdhci_esdhc_probe,
.remove = sdhci_esdhc_remove, .remove = sdhci_pltfm_unregister,
}; };
module_platform_driver(sdhci_esdhc_driver); module_platform_driver(sdhci_esdhc_driver);
......
...@@ -75,11 +75,6 @@ static int sdhci_hlwd_probe(struct platform_device *pdev) ...@@ -75,11 +75,6 @@ static int sdhci_hlwd_probe(struct platform_device *pdev)
return sdhci_pltfm_register(pdev, &sdhci_hlwd_pdata, 0); return sdhci_pltfm_register(pdev, &sdhci_hlwd_pdata, 0);
} }
static int sdhci_hlwd_remove(struct platform_device *pdev)
{
return sdhci_pltfm_unregister(pdev);
}
static const struct of_device_id sdhci_hlwd_of_match[] = { static const struct of_device_id sdhci_hlwd_of_match[] = {
{ .compatible = "nintendo,hollywood-sdhci" }, { .compatible = "nintendo,hollywood-sdhci" },
{ } { }
...@@ -93,7 +88,7 @@ static struct platform_driver sdhci_hlwd_driver = { ...@@ -93,7 +88,7 @@ static struct platform_driver sdhci_hlwd_driver = {
.pm = SDHCI_PLTFM_PMOPS, .pm = SDHCI_PLTFM_PMOPS,
}, },
.probe = sdhci_hlwd_probe, .probe = sdhci_hlwd_probe,
.remove = sdhci_hlwd_remove, .remove = sdhci_pltfm_unregister,
}; };
module_platform_driver(sdhci_hlwd_driver); module_platform_driver(sdhci_hlwd_driver);
......
...@@ -193,13 +193,6 @@ static int sdhci_sirf_probe(struct platform_device *pdev) ...@@ -193,13 +193,6 @@ static int sdhci_sirf_probe(struct platform_device *pdev)
return ret; return ret;
} }
static int sdhci_sirf_remove(struct platform_device *pdev)
{
struct sdhci_host *host = platform_get_drvdata(pdev);
return sdhci_pltfm_unregister(pdev);
}
#ifdef CONFIG_PM_SLEEP #ifdef CONFIG_PM_SLEEP
static int sdhci_sirf_suspend(struct device *dev) static int sdhci_sirf_suspend(struct device *dev)
{ {
...@@ -249,7 +242,7 @@ static struct platform_driver sdhci_sirf_driver = { ...@@ -249,7 +242,7 @@ static struct platform_driver sdhci_sirf_driver = {
#endif #endif
}, },
.probe = sdhci_sirf_probe, .probe = sdhci_sirf_probe,
.remove = sdhci_sirf_remove, .remove = sdhci_pltfm_unregister,
}; };
module_platform_driver(sdhci_sirf_driver); module_platform_driver(sdhci_sirf_driver);
......
...@@ -113,11 +113,6 @@ static int sdhci_st_probe(struct platform_device *pdev) ...@@ -113,11 +113,6 @@ static int sdhci_st_probe(struct platform_device *pdev)
return ret; return ret;
} }
static int sdhci_st_remove(struct platform_device *pdev)
{
return sdhci_pltfm_unregister(pdev);
}
#ifdef CONFIG_PM_SLEEP #ifdef CONFIG_PM_SLEEP
static int sdhci_st_suspend(struct device *dev) static int sdhci_st_suspend(struct device *dev)
{ {
...@@ -155,7 +150,7 @@ MODULE_DEVICE_TABLE(of, st_sdhci_match); ...@@ -155,7 +150,7 @@ MODULE_DEVICE_TABLE(of, st_sdhci_match);
static struct platform_driver sdhci_st_driver = { static struct platform_driver sdhci_st_driver = {
.probe = sdhci_st_probe, .probe = sdhci_st_probe,
.remove = sdhci_st_remove, .remove = sdhci_pltfm_unregister,
.driver = { .driver = {
.name = "sdhci-st", .name = "sdhci-st",
.pm = &sdhci_st_pmops, .pm = &sdhci_st_pmops,
......
...@@ -321,11 +321,6 @@ static int sdhci_tegra_probe(struct platform_device *pdev) ...@@ -321,11 +321,6 @@ static int sdhci_tegra_probe(struct platform_device *pdev)
return rc; return rc;
} }
static int sdhci_tegra_remove(struct platform_device *pdev)
{
return sdhci_pltfm_unregister(pdev);
}
static struct platform_driver sdhci_tegra_driver = { static struct platform_driver sdhci_tegra_driver = {
.driver = { .driver = {
.name = "sdhci-tegra", .name = "sdhci-tegra",
...@@ -333,7 +328,7 @@ static struct platform_driver sdhci_tegra_driver = { ...@@ -333,7 +328,7 @@ static struct platform_driver sdhci_tegra_driver = {
.pm = SDHCI_PLTFM_PMOPS, .pm = SDHCI_PLTFM_PMOPS,
}, },
.probe = sdhci_tegra_probe, .probe = sdhci_tegra_probe,
.remove = sdhci_tegra_remove, .remove = sdhci_pltfm_unregister,
}; };
module_platform_driver(sdhci_tegra_driver); module_platform_driver(sdhci_tegra_driver);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment