mirror of
https://github.com/linux-msm/laptops-kernel.git
synced 2026-08-13 14:19:53 -07:00
mmc: Switch back to struct platform_driver::remove()
After commit 0edb555a65 ("platform: Make platform_driver::remove()
return void") .remove() is (again) the right callback to implement for
platform drivers.
Convert all platform drivers below drivers/mmc to use .remove(), with
the eventual goal to drop struct platform_driver::remove_new(). As
.remove() and .remove_new() have the same prototypes, conversion is done
by just changing the structure member name in the driver initializer.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@baylibre.com>
Link: https://lore.kernel.org/r/20240927145832.754697-2-u.kleine-koenig@baylibre.com
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
This commit is contained in:
Uwe Kleine-König
committed by
Ulf Hansson
Ulf Hansson
parent
4dede2b76f
commit
078e548af9
@@ -107,7 +107,7 @@ MODULE_DEVICE_TABLE(of, mmc_pwrseq_emmc_of_match);
|
||||
|
||||
static struct platform_driver mmc_pwrseq_emmc_driver = {
|
||||
.probe = mmc_pwrseq_emmc_probe,
|
||||
.remove_new = mmc_pwrseq_emmc_remove,
|
||||
.remove = mmc_pwrseq_emmc_remove,
|
||||
.driver = {
|
||||
.name = "pwrseq_emmc",
|
||||
.of_match_table = mmc_pwrseq_emmc_of_match,
|
||||
|
||||
@@ -122,7 +122,7 @@ static void mmc_pwrseq_sd8787_remove(struct platform_device *pdev)
|
||||
|
||||
static struct platform_driver mmc_pwrseq_sd8787_driver = {
|
||||
.probe = mmc_pwrseq_sd8787_probe,
|
||||
.remove_new = mmc_pwrseq_sd8787_remove,
|
||||
.remove = mmc_pwrseq_sd8787_remove,
|
||||
.driver = {
|
||||
.name = "pwrseq_sd8787",
|
||||
.of_match_table = mmc_pwrseq_sd8787_of_match,
|
||||
|
||||
@@ -151,7 +151,7 @@ static void mmc_pwrseq_simple_remove(struct platform_device *pdev)
|
||||
|
||||
static struct platform_driver mmc_pwrseq_simple_driver = {
|
||||
.probe = mmc_pwrseq_simple_probe,
|
||||
.remove_new = mmc_pwrseq_simple_remove,
|
||||
.remove = mmc_pwrseq_simple_remove,
|
||||
.driver = {
|
||||
.name = "pwrseq_simple",
|
||||
.of_match_table = mmc_pwrseq_simple_of_match,
|
||||
|
||||
@@ -1175,7 +1175,7 @@ MODULE_DEVICE_TABLE(platform, alcor_pci_sdmmc_ids);
|
||||
|
||||
static struct platform_driver alcor_pci_sdmmc_driver = {
|
||||
.probe = alcor_pci_sdmmc_drv_probe,
|
||||
.remove_new = alcor_pci_sdmmc_drv_remove,
|
||||
.remove = alcor_pci_sdmmc_drv_remove,
|
||||
.id_table = alcor_pci_sdmmc_ids,
|
||||
.driver = {
|
||||
.name = DRV_NAME_ALCOR_PCI_SDMMC,
|
||||
|
||||
@@ -2653,7 +2653,7 @@ static const struct dev_pm_ops atmci_dev_pm_ops = {
|
||||
|
||||
static struct platform_driver atmci_driver = {
|
||||
.probe = atmci_probe,
|
||||
.remove_new = atmci_remove,
|
||||
.remove = atmci_remove,
|
||||
.driver = {
|
||||
.name = "atmel_mci",
|
||||
.probe_type = PROBE_PREFER_ASYNCHRONOUS,
|
||||
|
||||
@@ -1185,7 +1185,7 @@ static int au1xmmc_resume(struct platform_device *pdev)
|
||||
|
||||
static struct platform_driver au1xmmc_driver = {
|
||||
.probe = au1xmmc_probe,
|
||||
.remove_new = au1xmmc_remove,
|
||||
.remove = au1xmmc_remove,
|
||||
.suspend = au1xmmc_suspend,
|
||||
.resume = au1xmmc_resume,
|
||||
.driver = {
|
||||
|
||||
@@ -1459,7 +1459,7 @@ MODULE_DEVICE_TABLE(of, bcm2835_match);
|
||||
|
||||
static struct platform_driver bcm2835_driver = {
|
||||
.probe = bcm2835_probe,
|
||||
.remove_new = bcm2835_remove,
|
||||
.remove = bcm2835_remove,
|
||||
.driver = {
|
||||
.name = "sdhost-bcm2835",
|
||||
.probe_type = PROBE_PREFER_ASYNCHRONOUS,
|
||||
|
||||
@@ -326,7 +326,7 @@ MODULE_DEVICE_TABLE(of, octeon_mmc_match);
|
||||
|
||||
static struct platform_driver octeon_mmc_driver = {
|
||||
.probe = octeon_mmc_probe,
|
||||
.remove_new = octeon_mmc_remove,
|
||||
.remove = octeon_mmc_remove,
|
||||
.driver = {
|
||||
.name = KBUILD_MODNAME,
|
||||
.probe_type = PROBE_PREFER_ASYNCHRONOUS,
|
||||
|
||||
@@ -771,7 +771,7 @@ static void cb710_mmc_exit(struct platform_device *pdev)
|
||||
static struct platform_driver cb710_mmc_driver = {
|
||||
.driver.name = "cb710-mmc",
|
||||
.probe = cb710_mmc_init,
|
||||
.remove_new = cb710_mmc_exit,
|
||||
.remove = cb710_mmc_exit,
|
||||
#ifdef CONFIG_PM
|
||||
.suspend = cb710_mmc_suspend,
|
||||
.resume = cb710_mmc_resume,
|
||||
|
||||
@@ -1400,7 +1400,7 @@ static struct platform_driver davinci_mmcsd_driver = {
|
||||
.of_match_table = davinci_mmc_dt_ids,
|
||||
},
|
||||
.probe = davinci_mmcsd_probe,
|
||||
.remove_new = davinci_mmcsd_remove,
|
||||
.remove = davinci_mmcsd_remove,
|
||||
.id_table = davinci_mmc_devtype,
|
||||
};
|
||||
|
||||
|
||||
@@ -68,7 +68,7 @@ static int dw_mci_bluefield_probe(struct platform_device *pdev)
|
||||
|
||||
static struct platform_driver dw_mci_bluefield_pltfm_driver = {
|
||||
.probe = dw_mci_bluefield_probe,
|
||||
.remove_new = dw_mci_pltfm_remove,
|
||||
.remove = dw_mci_pltfm_remove,
|
||||
.driver = {
|
||||
.name = "dwmmc_bluefield",
|
||||
.probe_type = PROBE_PREFER_ASYNCHRONOUS,
|
||||
|
||||
@@ -682,7 +682,7 @@ static const struct dev_pm_ops dw_mci_exynos_pmops = {
|
||||
|
||||
static struct platform_driver dw_mci_exynos_pltfm_driver = {
|
||||
.probe = dw_mci_exynos_probe,
|
||||
.remove_new = dw_mci_exynos_remove,
|
||||
.remove = dw_mci_exynos_remove,
|
||||
.driver = {
|
||||
.name = "dwmmc_exynos",
|
||||
.probe_type = PROBE_PREFER_ASYNCHRONOUS,
|
||||
|
||||
@@ -189,7 +189,7 @@ static const struct of_device_id dw_mci_hi3798cv200_match[] = {
|
||||
MODULE_DEVICE_TABLE(of, dw_mci_hi3798cv200_match);
|
||||
static struct platform_driver dw_mci_hi3798cv200_driver = {
|
||||
.probe = dw_mci_hi3798cv200_probe,
|
||||
.remove_new = dw_mci_hi3798cv200_remove,
|
||||
.remove = dw_mci_hi3798cv200_remove,
|
||||
.driver = {
|
||||
.name = "dwmmc_hi3798cv200",
|
||||
.probe_type = PROBE_PREFER_ASYNCHRONOUS,
|
||||
|
||||
@@ -237,7 +237,7 @@ static void dw_mci_hi3798mv200_remove(struct platform_device *pdev)
|
||||
MODULE_DEVICE_TABLE(of, dw_mci_hi3798mv200_match);
|
||||
static struct platform_driver dw_mci_hi3798mv200_driver = {
|
||||
.probe = dw_mci_hi3798mv200_probe,
|
||||
.remove_new = dw_mci_hi3798mv200_remove,
|
||||
.remove = dw_mci_hi3798mv200_remove,
|
||||
.driver = {
|
||||
.name = "dwmmc_hi3798mv200",
|
||||
.probe_type = PROBE_PREFER_ASYNCHRONOUS,
|
||||
|
||||
@@ -470,7 +470,7 @@ static const struct dev_pm_ops dw_mci_k3_dev_pm_ops = {
|
||||
|
||||
static struct platform_driver dw_mci_k3_pltfm_driver = {
|
||||
.probe = dw_mci_k3_probe,
|
||||
.remove_new = dw_mci_pltfm_remove,
|
||||
.remove = dw_mci_pltfm_remove,
|
||||
.driver = {
|
||||
.name = "dwmmc_k3",
|
||||
.probe_type = PROBE_PREFER_ASYNCHRONOUS,
|
||||
|
||||
@@ -131,7 +131,7 @@ EXPORT_SYMBOL_GPL(dw_mci_pltfm_remove);
|
||||
|
||||
static struct platform_driver dw_mci_pltfm_driver = {
|
||||
.probe = dw_mci_pltfm_probe,
|
||||
.remove_new = dw_mci_pltfm_remove,
|
||||
.remove = dw_mci_pltfm_remove,
|
||||
.driver = {
|
||||
.name = "dw_mmc",
|
||||
.probe_type = PROBE_PREFER_ASYNCHRONOUS,
|
||||
|
||||
@@ -577,7 +577,7 @@ static const struct dev_pm_ops dw_mci_rockchip_dev_pm_ops = {
|
||||
|
||||
static struct platform_driver dw_mci_rockchip_pltfm_driver = {
|
||||
.probe = dw_mci_rockchip_probe,
|
||||
.remove_new = dw_mci_rockchip_remove,
|
||||
.remove = dw_mci_rockchip_remove,
|
||||
.driver = {
|
||||
.name = "dwmmc_rockchip",
|
||||
.probe_type = PROBE_PREFER_ASYNCHRONOUS,
|
||||
|
||||
@@ -115,7 +115,7 @@ static int dw_mci_starfive_probe(struct platform_device *pdev)
|
||||
|
||||
static struct platform_driver dw_mci_starfive_driver = {
|
||||
.probe = dw_mci_starfive_probe,
|
||||
.remove_new = dw_mci_pltfm_remove,
|
||||
.remove = dw_mci_pltfm_remove,
|
||||
.driver = {
|
||||
.name = "dwmmc_starfive",
|
||||
.probe_type = PROBE_PREFER_ASYNCHRONOUS,
|
||||
|
||||
@@ -1191,7 +1191,7 @@ static DEFINE_SIMPLE_DEV_PM_OPS(jz4740_mmc_pm_ops, jz4740_mmc_suspend,
|
||||
|
||||
static struct platform_driver jz4740_mmc_driver = {
|
||||
.probe = jz4740_mmc_probe,
|
||||
.remove_new = jz4740_mmc_remove,
|
||||
.remove = jz4740_mmc_remove,
|
||||
.driver = {
|
||||
.name = "jz4740-mmc",
|
||||
.probe_type = PROBE_PREFER_ASYNCHRONOUS,
|
||||
|
||||
@@ -644,7 +644,7 @@ MODULE_DEVICE_TABLE(of, litex_match);
|
||||
|
||||
static struct platform_driver litex_mmc_driver = {
|
||||
.probe = litex_mmc_probe,
|
||||
.remove_new = litex_mmc_remove,
|
||||
.remove = litex_mmc_remove,
|
||||
.driver = {
|
||||
.name = "litex-mmc",
|
||||
.of_match_table = litex_match,
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user