mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-12-28 16:56:26 +00:00
soc: 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/soc 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.
On the way do a few whitespace changes to make indention consistent.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@baylibre.com>
Acked-by: Heiko Stuebner <heiko@sntech.de>
Acked-by: Herve Codina <herve.codina@bootlin.com> # for fsl/qe/{qmc,tsa}.c
Acked-by: Bjorn Andersson <andersson@kernel.org> # qcom parts
Acked-by: Gabriel Somlo <gsomlo@gmail.com>
Acked-by: Andrew Jeffery <andrew@codeconstruct.com.au> # aspeed
Link: https://lore.kernel.org/r/20241029074859.509587-2-u.kleine-koenig@baylibre.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
parent
42f7652d3e
commit
511c06e390
@ -353,7 +353,7 @@ static struct platform_driver aspeed_lpc_ctrl_driver = {
|
||||
.of_match_table = aspeed_lpc_ctrl_match,
|
||||
},
|
||||
.probe = aspeed_lpc_ctrl_probe,
|
||||
.remove_new = aspeed_lpc_ctrl_remove,
|
||||
.remove = aspeed_lpc_ctrl_remove,
|
||||
};
|
||||
|
||||
module_platform_driver(aspeed_lpc_ctrl_driver);
|
||||
|
@ -366,7 +366,7 @@ static struct platform_driver aspeed_lpc_snoop_driver = {
|
||||
.of_match_table = aspeed_lpc_snoop_match,
|
||||
},
|
||||
.probe = aspeed_lpc_snoop_probe,
|
||||
.remove_new = aspeed_lpc_snoop_remove,
|
||||
.remove = aspeed_lpc_snoop_remove,
|
||||
};
|
||||
|
||||
module_platform_driver(aspeed_lpc_snoop_driver);
|
||||
|
@ -431,7 +431,7 @@ static struct platform_driver aspeed_p2a_ctrl_driver = {
|
||||
.of_match_table = aspeed_p2a_ctrl_match,
|
||||
},
|
||||
.probe = aspeed_p2a_ctrl_probe,
|
||||
.remove_new = aspeed_p2a_ctrl_remove,
|
||||
.remove = aspeed_p2a_ctrl_remove,
|
||||
};
|
||||
|
||||
module_platform_driver(aspeed_p2a_ctrl_driver);
|
||||
|
@ -589,7 +589,7 @@ static struct platform_driver aspeed_uart_routing_driver = {
|
||||
.of_match_table = aspeed_uart_routing_table,
|
||||
},
|
||||
.probe = aspeed_uart_routing_probe,
|
||||
.remove_new = aspeed_uart_routing_remove,
|
||||
.remove = aspeed_uart_routing_remove,
|
||||
};
|
||||
|
||||
module_platform_driver(aspeed_uart_routing_driver);
|
||||
|
@ -320,7 +320,7 @@ static struct platform_driver dpaa2_console_driver = {
|
||||
.of_match_table = dpaa2_console_match_table,
|
||||
},
|
||||
.probe = dpaa2_console_probe,
|
||||
.remove_new = dpaa2_console_remove,
|
||||
.remove = dpaa2_console_remove,
|
||||
};
|
||||
module_platform_driver(dpaa2_console_driver);
|
||||
|
||||
|
@ -2092,7 +2092,7 @@ static struct platform_driver qmc_driver = {
|
||||
.of_match_table = of_match_ptr(qmc_id_table),
|
||||
},
|
||||
.probe = qmc_probe,
|
||||
.remove_new = qmc_remove,
|
||||
.remove = qmc_remove,
|
||||
};
|
||||
module_platform_driver(qmc_driver);
|
||||
|
||||
|
@ -1086,7 +1086,7 @@ static struct platform_driver tsa_driver = {
|
||||
.of_match_table = of_match_ptr(tsa_id_table),
|
||||
},
|
||||
.probe = tsa_probe,
|
||||
.remove_new = tsa_remove,
|
||||
.remove = tsa_remove,
|
||||
};
|
||||
module_platform_driver(tsa_driver);
|
||||
|
||||
|
@ -142,7 +142,7 @@ static struct platform_driver a64fx_diag_driver = {
|
||||
.acpi_match_table = ACPI_PTR(a64fx_diag_acpi_match),
|
||||
},
|
||||
.probe = a64fx_diag_probe,
|
||||
.remove_new = a64fx_diag_remove,
|
||||
.remove = a64fx_diag_remove,
|
||||
};
|
||||
|
||||
module_platform_driver(a64fx_diag_driver);
|
||||
|
@ -1348,7 +1348,7 @@ MODULE_DEVICE_TABLE(acpi, hccs_acpi_match);
|
||||
|
||||
static struct platform_driver hccs_driver = {
|
||||
.probe = hccs_probe,
|
||||
.remove_new = hccs_remove,
|
||||
.remove = hccs_remove,
|
||||
.driver = {
|
||||
.name = "kunpeng_hccs",
|
||||
.acpi_match_table = hccs_acpi_match,
|
||||
|
@ -759,7 +759,7 @@ static struct platform_driver ixp4xx_npe_driver = {
|
||||
.of_match_table = ixp4xx_npe_of_match,
|
||||
},
|
||||
.probe = ixp4xx_npe_probe,
|
||||
.remove_new = ixp4xx_npe_remove,
|
||||
.remove = ixp4xx_npe_remove,
|
||||
};
|
||||
module_platform_driver(ixp4xx_npe_driver);
|
||||
|
||||
|
@ -461,7 +461,7 @@ static struct platform_driver ixp4xx_qmgr_driver = {
|
||||
.of_match_table = ixp4xx_qmgr_of_match,
|
||||
},
|
||||
.probe = ixp4xx_qmgr_probe,
|
||||
.remove_new = ixp4xx_qmgr_remove,
|
||||
.remove = ixp4xx_qmgr_remove,
|
||||
};
|
||||
module_platform_driver(ixp4xx_qmgr_driver);
|
||||
|
||||
|
@ -131,7 +131,7 @@ static struct platform_driver litex_soc_ctrl_driver = {
|
||||
.of_match_table = litex_soc_ctrl_of_match,
|
||||
},
|
||||
.probe = litex_soc_ctrl_probe,
|
||||
.remove_new = litex_soc_ctrl_remove,
|
||||
.remove = litex_soc_ctrl_remove,
|
||||
};
|
||||
|
||||
module_platform_driver(litex_soc_ctrl_driver);
|
||||
|
@ -169,7 +169,7 @@ static struct platform_driver loongson2_guts_driver = {
|
||||
.of_match_table = loongson2_guts_of_match,
|
||||
},
|
||||
.probe = loongson2_guts_probe,
|
||||
.remove_new = loongson2_guts_remove,
|
||||
.remove = loongson2_guts_remove,
|
||||
};
|
||||
|
||||
static int __init loongson2_guts_init(void)
|
||||
|
@ -301,7 +301,7 @@ static void mtk_devapc_remove(struct platform_device *pdev)
|
||||
|
||||
static struct platform_driver mtk_devapc_driver = {
|
||||
.probe = mtk_devapc_probe,
|
||||
.remove_new = mtk_devapc_remove,
|
||||
.remove = mtk_devapc_remove,
|
||||
.driver = {
|
||||
.name = "mtk-devapc",
|
||||
.of_match_table = mtk_devapc_dt_match,
|
||||
|
@ -487,7 +487,7 @@ static struct platform_driver mtk_mmsys_drv = {
|
||||
.of_match_table = of_match_mtk_mmsys,
|
||||
},
|
||||
.probe = mtk_mmsys_probe,
|
||||
.remove_new = mtk_mmsys_remove,
|
||||
.remove = mtk_mmsys_remove,
|
||||
};
|
||||
module_platform_driver(mtk_mmsys_drv);
|
||||
|
||||
|
@ -187,7 +187,7 @@ static void mtk_socinfo_remove(struct platform_device *pdev)
|
||||
|
||||
static struct platform_driver mtk_socinfo = {
|
||||
.probe = mtk_socinfo_probe,
|
||||
.remove_new = mtk_socinfo_remove,
|
||||
.remove = mtk_socinfo_remove,
|
||||
.driver = {
|
||||
.name = "mtk-socinfo",
|
||||
},
|
||||
|
@ -232,7 +232,7 @@ static struct platform_driver mpfs_sys_controller_driver = {
|
||||
.of_match_table = mpfs_sys_controller_of_match,
|
||||
},
|
||||
.probe = mpfs_sys_controller_probe,
|
||||
.remove_new = mpfs_sys_controller_remove,
|
||||
.remove = mpfs_sys_controller_remove,
|
||||
};
|
||||
module_platform_driver(mpfs_sys_controller_driver);
|
||||
|
||||
|
@ -197,7 +197,7 @@ static const struct platform_device_id ssp_id_table[] = {
|
||||
|
||||
static struct platform_driver pxa_ssp_driver = {
|
||||
.probe = pxa_ssp_probe,
|
||||
.remove_new = pxa_ssp_remove,
|
||||
.remove = pxa_ssp_remove,
|
||||
.driver = {
|
||||
.name = "pxa2xx-ssp",
|
||||
.of_match_table = of_match_ptr(pxa_ssp_of_ids),
|
||||
|
@ -872,7 +872,7 @@ MODULE_DEVICE_TABLE(of, bwmon_of_match);
|
||||
|
||||
static struct platform_driver bwmon_driver = {
|
||||
.probe = bwmon_probe,
|
||||
.remove_new = bwmon_remove,
|
||||
.remove = bwmon_remove,
|
||||
.driver = {
|
||||
.name = "qcom-bwmon",
|
||||
.of_match_table = bwmon_of_match,
|
||||
|
@ -1401,7 +1401,7 @@ static struct platform_driver qcom_llcc_driver = {
|
||||
.of_match_table = qcom_llcc_of_match,
|
||||
},
|
||||
.probe = qcom_llcc_probe,
|
||||
.remove_new = qcom_llcc_remove,
|
||||
.remove = qcom_llcc_remove,
|
||||
};
|
||||
module_platform_driver(qcom_llcc_driver);
|
||||
|
||||
|
@ -439,7 +439,7 @@ MODULE_DEVICE_TABLE(of, ocmem_of_match);
|
||||
|
||||
static struct platform_driver ocmem_driver = {
|
||||
.probe = ocmem_dev_probe,
|
||||
.remove_new = ocmem_dev_remove,
|
||||
.remove = ocmem_dev_remove,
|
||||
.driver = {
|
||||
.name = "ocmem",
|
||||
.of_match_table = ocmem_of_match,
|
||||
|
@ -380,7 +380,7 @@ MODULE_DEVICE_TABLE(of, pmic_glink_of_match);
|
||||
|
||||
static struct platform_driver pmic_glink_driver = {
|
||||
.probe = pmic_glink_probe,
|
||||
.remove_new = pmic_glink_remove,
|
||||
.remove = pmic_glink_remove,
|
||||
.driver = {
|
||||
.name = "qcom_pmic_glink",
|
||||
.of_match_table = pmic_glink_of_match,
|
||||
|
@ -664,7 +664,7 @@ static struct platform_driver qmp_driver = {
|
||||
.suppress_bind_attrs = true,
|
||||
},
|
||||
.probe = qmp_probe,
|
||||
.remove_new = qmp_remove,
|
||||
.remove = qmp_remove,
|
||||
};
|
||||
module_platform_driver(qmp_driver);
|
||||
|
||||
|
@ -232,7 +232,7 @@ static struct platform_driver gsbi_driver = {
|
||||
.of_match_table = gsbi_dt_match,
|
||||
},
|
||||
.probe = gsbi_probe,
|
||||
.remove_new = gsbi_remove,
|
||||
.remove = gsbi_remove,
|
||||
};
|
||||
|
||||
module_platform_driver(gsbi_driver);
|
||||
|
@ -274,7 +274,7 @@ MODULE_DEVICE_TABLE(of, qcom_stats_table);
|
||||
|
||||
static struct platform_driver qcom_stats = {
|
||||
.probe = qcom_stats_probe,
|
||||
.remove_new = qcom_stats_remove,
|
||||
.remove = qcom_stats_remove,
|
||||
.driver = {
|
||||
.name = "qcom_stats",
|
||||
.of_match_table = qcom_stats_table,
|
||||
|
@ -331,8 +331,8 @@ static struct platform_driver qcom_ramp_controller_driver = {
|
||||
.of_match_table = qcom_ramp_controller_match_table,
|
||||
.suppress_bind_attrs = true,
|
||||
},
|
||||
.probe = qcom_ramp_controller_probe,
|
||||
.remove_new = qcom_ramp_controller_remove,
|
||||
.probe = qcom_ramp_controller_probe,
|
||||
.remove = qcom_ramp_controller_remove,
|
||||
};
|
||||
|
||||
static int __init qcom_ramp_controller_init(void)
|
||||
|
@ -315,7 +315,7 @@ MODULE_DEVICE_TABLE(of, qcom_rmtfs_mem_of_match);
|
||||
|
||||
static struct platform_driver qcom_rmtfs_mem_driver = {
|
||||
.probe = qcom_rmtfs_mem_probe,
|
||||
.remove_new = qcom_rmtfs_mem_remove,
|
||||
.remove = qcom_rmtfs_mem_remove,
|
||||
.driver = {
|
||||
.name = "qcom_rmtfs_mem",
|
||||
.of_match_table = qcom_rmtfs_mem_of_match,
|
||||
|
@ -53,7 +53,7 @@ MODULE_DEVICE_TABLE(of, rpm_proc_of_match);
|
||||
|
||||
static struct platform_driver rpm_proc_driver = {
|
||||
.probe = rpm_proc_probe,
|
||||
.remove_new = rpm_proc_remove,
|
||||
.remove = rpm_proc_remove,
|
||||
.driver = {
|
||||
.name = "qcom-rpm-proc",
|
||||
.of_match_table = rpm_proc_of_match,
|
||||
|
@ -155,7 +155,7 @@ static const struct of_device_id rpm_master_table[] = {
|
||||
|
||||
static struct platform_driver master_stats_driver = {
|
||||
.probe = master_stats_probe,
|
||||
.remove_new = master_stats_remove,
|
||||
.remove = master_stats_remove,
|
||||
.driver = {
|
||||
.name = "qcom_rpm_master_stats",
|
||||
.of_match_table = rpm_master_table,
|
||||
|
@ -1251,7 +1251,7 @@ MODULE_DEVICE_TABLE(of, qcom_smem_of_match);
|
||||
|
||||
static struct platform_driver qcom_smem_driver = {
|
||||
.probe = qcom_smem_probe,
|
||||
.remove_new = qcom_smem_remove,
|
||||
.remove = qcom_smem_remove,
|
||||
.driver = {
|
||||
.name = "qcom-smem",
|
||||
.of_match_table = qcom_smem_of_match,
|
||||
|
@ -698,7 +698,7 @@ MODULE_DEVICE_TABLE(of, qcom_smp2p_of_match);
|
||||
|
||||
static struct platform_driver qcom_smp2p_driver = {
|
||||
.probe = qcom_smp2p_probe,
|
||||
.remove_new = qcom_smp2p_remove,
|
||||
.remove = qcom_smp2p_remove,
|
||||
.driver = {
|
||||
.name = "qcom_smp2p",
|
||||
.of_match_table = qcom_smp2p_of_match,
|
||||
|
@ -682,9 +682,9 @@ MODULE_DEVICE_TABLE(of, qcom_smsm_of_match);
|
||||
|
||||
static struct platform_driver qcom_smsm_driver = {
|
||||
.probe = qcom_smsm_probe,
|
||||
.remove_new = qcom_smsm_remove,
|
||||
.driver = {
|
||||
.name = "qcom-smsm",
|
||||
.remove = qcom_smsm_remove,
|
||||
.driver = {
|
||||
.name = "qcom-smsm",
|
||||
.of_match_table = qcom_smsm_of_match,
|
||||
},
|
||||
};
|
||||
|
@ -816,7 +816,7 @@ static void qcom_socinfo_remove(struct platform_device *pdev)
|
||||
|
||||
static struct platform_driver qcom_socinfo_driver = {
|
||||
.probe = qcom_socinfo_probe,
|
||||
.remove_new = qcom_socinfo_remove,
|
||||
.remove = qcom_socinfo_remove,
|
||||
.driver = {
|
||||
.name = "qcom-socinfo",
|
||||
},
|
||||
|
@ -742,10 +742,10 @@ static void rockchip_iodomain_remove(struct platform_device *pdev)
|
||||
}
|
||||
|
||||
static struct platform_driver rockchip_iodomain_driver = {
|
||||
.probe = rockchip_iodomain_probe,
|
||||
.remove_new = rockchip_iodomain_remove,
|
||||
.driver = {
|
||||
.name = "rockchip-iodomain",
|
||||
.probe = rockchip_iodomain_probe,
|
||||
.remove = rockchip_iodomain_remove,
|
||||
.driver = {
|
||||
.name = "rockchip-iodomain",
|
||||
.of_match_table = rockchip_iodomain_match,
|
||||
},
|
||||
};
|
||||
|
@ -195,8 +195,8 @@ static struct platform_driver exynos_chipid_driver = {
|
||||
.name = "exynos-chipid",
|
||||
.of_match_table = exynos_chipid_of_device_ids,
|
||||
},
|
||||
.probe = exynos_chipid_probe,
|
||||
.remove_new = exynos_chipid_remove,
|
||||
.probe = exynos_chipid_probe,
|
||||
.remove = exynos_chipid_remove,
|
||||
};
|
||||
module_platform_driver(exynos_chipid_driver);
|
||||
|
||||
|
@ -2330,7 +2330,7 @@ static const struct dev_pm_ops tegra194_cbb_pm = {
|
||||
|
||||
static struct platform_driver tegra194_cbb_driver = {
|
||||
.probe = tegra194_cbb_probe,
|
||||
.remove_new = tegra194_cbb_remove,
|
||||
.remove = tegra194_cbb_remove,
|
||||
.driver = {
|
||||
.name = "tegra194-cbb",
|
||||
.of_match_table = of_match_ptr(tegra194_cbb_match),
|
||||
|
@ -1562,7 +1562,7 @@ static void k3_ringacc_remove(struct platform_device *pdev)
|
||||
|
||||
static struct platform_driver k3_ringacc_driver = {
|
||||
.probe = k3_ringacc_probe,
|
||||
.remove_new = k3_ringacc_remove,
|
||||
.remove = k3_ringacc_remove,
|
||||
.driver = {
|
||||
.name = "k3-ringacc",
|
||||
.of_match_table = k3_ringacc_of_match,
|
||||
|
@ -783,8 +783,8 @@ MODULE_DEVICE_TABLE(of, of_match);
|
||||
|
||||
static struct platform_driver knav_dma_driver = {
|
||||
.probe = knav_dma_probe,
|
||||
.remove_new = knav_dma_remove,
|
||||
.driver = {
|
||||
.remove = knav_dma_remove,
|
||||
.driver = {
|
||||
.name = "keystone-navigator-dma",
|
||||
.of_match_table = of_match,
|
||||
},
|
||||
|
@ -1894,7 +1894,7 @@ static void knav_queue_remove(struct platform_device *pdev)
|
||||
|
||||
static struct platform_driver keystone_qmss_driver = {
|
||||
.probe = knav_queue_probe,
|
||||
.remove_new = knav_queue_remove,
|
||||
.remove = knav_queue_remove,
|
||||
.driver = {
|
||||
.name = "keystone-navigator-qmss",
|
||||
.of_match_table = keystone_qmss_of_match,
|
||||
|
@ -591,7 +591,7 @@ static struct platform_driver am33xx_pm_driver = {
|
||||
.name = "pm33xx",
|
||||
},
|
||||
.probe = am33xx_pm_probe,
|
||||
.remove_new = am33xx_pm_remove,
|
||||
.remove = am33xx_pm_remove,
|
||||
};
|
||||
module_platform_driver(am33xx_pm_driver);
|
||||
|
||||
|
@ -593,8 +593,8 @@ static struct platform_driver pruss_driver = {
|
||||
.name = "pruss",
|
||||
.of_match_table = pruss_of_match,
|
||||
},
|
||||
.probe = pruss_probe,
|
||||
.remove_new = pruss_remove,
|
||||
.probe = pruss_probe,
|
||||
.remove = pruss_remove,
|
||||
};
|
||||
module_platform_driver(pruss_driver);
|
||||
|
||||
|
@ -969,7 +969,7 @@ MODULE_DEVICE_TABLE(of, omap_sr_match);
|
||||
|
||||
static struct platform_driver smartreflex_driver = {
|
||||
.probe = omap_sr_probe,
|
||||
.remove_new = omap_sr_remove,
|
||||
.remove = omap_sr_remove,
|
||||
.shutdown = omap_sr_shutdown,
|
||||
.driver = {
|
||||
.name = DRIVER_NAME,
|
||||
|
@ -755,7 +755,7 @@ MODULE_DEVICE_TABLE(of, wkup_m3_ipc_of_match);
|
||||
|
||||
static struct platform_driver wkup_m3_ipc_driver = {
|
||||
.probe = wkup_m3_ipc_probe,
|
||||
.remove_new = wkup_m3_ipc_remove,
|
||||
.remove = wkup_m3_ipc_remove,
|
||||
.driver = {
|
||||
.name = "wkup_m3_ipc",
|
||||
.of_match_table = wkup_m3_ipc_of_match,
|
||||
|
@ -709,7 +709,7 @@ static void xlnx_event_manager_remove(struct platform_device *pdev)
|
||||
|
||||
static struct platform_driver xlnx_event_manager_driver = {
|
||||
.probe = xlnx_event_manager_probe,
|
||||
.remove_new = xlnx_event_manager_remove,
|
||||
.remove = xlnx_event_manager_remove,
|
||||
.driver = {
|
||||
.name = "xlnx_event_manager",
|
||||
},
|
||||
|
@ -408,7 +408,7 @@ MODULE_DEVICE_TABLE(of, pm_of_match);
|
||||
|
||||
static struct platform_driver zynqmp_pm_platform_driver = {
|
||||
.probe = zynqmp_pm_probe,
|
||||
.remove_new = zynqmp_pm_remove,
|
||||
.remove = zynqmp_pm_remove,
|
||||
.driver = {
|
||||
.name = "zynqmp_power",
|
||||
.of_match_table = pm_of_match,
|
||||
|
Loading…
Reference in New Issue
Block a user