mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
synced 2024-12-29 09:12:07 +00:00
interconnect: 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/interconnect 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/20241017154920.136220-2-u.kleine-koenig@baylibre.com
Signed-off-by: Georgi Djakov <djakov@kernel.org>
This commit is contained in:
parent
52cebda104
commit
31f1b03fbd
@ -88,7 +88,7 @@ static int imx8mm_icc_probe(struct platform_device *pdev)
|
||||
|
||||
static struct platform_driver imx8mm_icc_driver = {
|
||||
.probe = imx8mm_icc_probe,
|
||||
.remove_new = imx_icc_unregister,
|
||||
.remove = imx_icc_unregister,
|
||||
.driver = {
|
||||
.name = "imx8mm-interconnect",
|
||||
},
|
||||
|
@ -77,7 +77,7 @@ static int imx8mn_icc_probe(struct platform_device *pdev)
|
||||
|
||||
static struct platform_driver imx8mn_icc_driver = {
|
||||
.probe = imx8mn_icc_probe,
|
||||
.remove_new = imx_icc_unregister,
|
||||
.remove = imx_icc_unregister,
|
||||
.driver = {
|
||||
.name = "imx8mn-interconnect",
|
||||
},
|
||||
|
@ -241,7 +241,7 @@ static int imx8mp_icc_probe(struct platform_device *pdev)
|
||||
|
||||
static struct platform_driver imx8mp_icc_driver = {
|
||||
.probe = imx8mp_icc_probe,
|
||||
.remove_new = imx_icc_unregister,
|
||||
.remove = imx_icc_unregister,
|
||||
.driver = {
|
||||
.name = "imx8mp-interconnect",
|
||||
},
|
||||
|
@ -87,7 +87,7 @@ static int imx8mq_icc_probe(struct platform_device *pdev)
|
||||
|
||||
static struct platform_driver imx8mq_icc_driver = {
|
||||
.probe = imx8mq_icc_probe,
|
||||
.remove_new = imx_icc_unregister,
|
||||
.remove = imx_icc_unregister,
|
||||
.driver = {
|
||||
.name = "imx8mq-interconnect",
|
||||
.sync_state = icc_sync_state,
|
||||
|
@ -133,7 +133,7 @@ static struct platform_driver mtk_emi_icc_mt8183_driver = {
|
||||
.sync_state = icc_sync_state,
|
||||
},
|
||||
.probe = mtk_emi_icc_probe,
|
||||
.remove_new = mtk_emi_icc_remove,
|
||||
.remove = mtk_emi_icc_remove,
|
||||
|
||||
};
|
||||
module_platform_driver(mtk_emi_icc_mt8183_driver);
|
||||
|
@ -329,7 +329,7 @@ static struct platform_driver mtk_emi_icc_mt8195_driver = {
|
||||
.sync_state = icc_sync_state,
|
||||
},
|
||||
.probe = mtk_emi_icc_probe,
|
||||
.remove_new = mtk_emi_icc_remove,
|
||||
.remove = mtk_emi_icc_remove,
|
||||
|
||||
};
|
||||
module_platform_driver(mtk_emi_icc_mt8195_driver);
|
||||
|
@ -1316,7 +1316,7 @@ MODULE_DEVICE_TABLE(of, msm8909_noc_of_match);
|
||||
|
||||
static struct platform_driver msm8909_noc_driver = {
|
||||
.probe = qnoc_probe,
|
||||
.remove_new = qnoc_remove,
|
||||
.remove = qnoc_remove,
|
||||
.driver = {
|
||||
.name = "qnoc-msm8909",
|
||||
.of_match_table = msm8909_noc_of_match,
|
||||
|
@ -1344,7 +1344,7 @@ MODULE_DEVICE_TABLE(of, msm8916_noc_of_match);
|
||||
|
||||
static struct platform_driver msm8916_noc_driver = {
|
||||
.probe = qnoc_probe,
|
||||
.remove_new = qnoc_remove,
|
||||
.remove = qnoc_remove,
|
||||
.driver = {
|
||||
.name = "qnoc-msm8916",
|
||||
.of_match_table = msm8916_noc_of_match,
|
||||
|
@ -1337,7 +1337,7 @@ MODULE_DEVICE_TABLE(of, msm8937_noc_of_match);
|
||||
|
||||
static struct platform_driver msm8937_noc_driver = {
|
||||
.probe = qnoc_probe,
|
||||
.remove_new = qnoc_remove,
|
||||
.remove = qnoc_remove,
|
||||
.driver = {
|
||||
.name = "qnoc-msm8937",
|
||||
.of_match_table = msm8937_noc_of_match,
|
||||
|
@ -1421,7 +1421,7 @@ MODULE_DEVICE_TABLE(of, msm8939_noc_of_match);
|
||||
|
||||
static struct platform_driver msm8939_noc_driver = {
|
||||
.probe = qnoc_probe,
|
||||
.remove_new = qnoc_remove,
|
||||
.remove = qnoc_remove,
|
||||
.driver = {
|
||||
.name = "qnoc-msm8939",
|
||||
.of_match_table = msm8939_noc_of_match,
|
||||
|
@ -1310,7 +1310,7 @@ static const struct of_device_id msm8953_noc_of_match[] = {
|
||||
|
||||
static struct platform_driver msm8953_noc_driver = {
|
||||
.probe = qnoc_probe,
|
||||
.remove_new = qnoc_remove,
|
||||
.remove = qnoc_remove,
|
||||
.driver = {
|
||||
.name = "qnoc-msm8953",
|
||||
.of_match_table = msm8953_noc_of_match,
|
||||
|
@ -762,7 +762,7 @@ MODULE_DEVICE_TABLE(of, msm8974_noc_of_match);
|
||||
|
||||
static struct platform_driver msm8974_noc_driver = {
|
||||
.probe = msm8974_icc_probe,
|
||||
.remove_new = msm8974_icc_remove,
|
||||
.remove = msm8974_icc_remove,
|
||||
.driver = {
|
||||
.name = "qnoc-msm8974",
|
||||
.of_match_table = msm8974_noc_of_match,
|
||||
|
@ -1427,7 +1427,7 @@ MODULE_DEVICE_TABLE(of, msm8976_noc_of_match);
|
||||
|
||||
static struct platform_driver msm8976_noc_driver = {
|
||||
.probe = qnoc_probe,
|
||||
.remove_new = qnoc_remove,
|
||||
.remove = qnoc_remove,
|
||||
.driver = {
|
||||
.name = "qnoc-msm8976",
|
||||
.of_match_table = msm8976_noc_of_match,
|
||||
|
@ -2108,7 +2108,7 @@ MODULE_DEVICE_TABLE(of, qnoc_of_match);
|
||||
|
||||
static struct platform_driver qnoc_driver = {
|
||||
.probe = qnoc_probe,
|
||||
.remove_new = qnoc_remove,
|
||||
.remove = qnoc_remove,
|
||||
.driver = {
|
||||
.name = "qnoc-msm8996",
|
||||
.of_match_table = qnoc_of_match,
|
||||
|
@ -290,7 +290,7 @@ MODULE_DEVICE_TABLE(of, osm_l3_of_match);
|
||||
|
||||
static struct platform_driver osm_l3_driver = {
|
||||
.probe = qcom_osm_l3_probe,
|
||||
.remove_new = qcom_osm_l3_remove,
|
||||
.remove = qcom_osm_l3_remove,
|
||||
.driver = {
|
||||
.name = "osm-l3",
|
||||
.of_match_table = osm_l3_of_match,
|
||||
|
@ -1367,7 +1367,7 @@ MODULE_DEVICE_TABLE(of, qcm2290_noc_of_match);
|
||||
|
||||
static struct platform_driver qcm2290_noc_driver = {
|
||||
.probe = qnoc_probe,
|
||||
.remove_new = qnoc_remove,
|
||||
.remove = qnoc_remove,
|
||||
.driver = {
|
||||
.name = "qnoc-qcm2290",
|
||||
.of_match_table = qcm2290_noc_of_match,
|
||||
|
@ -1204,7 +1204,7 @@ MODULE_DEVICE_TABLE(of, qcs404_noc_of_match);
|
||||
|
||||
static struct platform_driver qcs404_noc_driver = {
|
||||
.probe = qnoc_probe,
|
||||
.remove_new = qnoc_remove,
|
||||
.remove = qnoc_remove,
|
||||
.driver = {
|
||||
.name = "qnoc-qcs404",
|
||||
.of_match_table = qcs404_noc_of_match,
|
||||
|
@ -1046,7 +1046,7 @@ MODULE_DEVICE_TABLE(of, qnoc_of_match);
|
||||
|
||||
static struct platform_driver qnoc_driver = {
|
||||
.probe = qnoc_probe,
|
||||
.remove_new = qcom_icc_rpmh_remove,
|
||||
.remove = qcom_icc_rpmh_remove,
|
||||
.driver = {
|
||||
.name = "qnoc-qdu1000",
|
||||
.of_match_table = qnoc_of_match,
|
||||
|
@ -2519,7 +2519,7 @@ MODULE_DEVICE_TABLE(of, qnoc_of_match);
|
||||
|
||||
static struct platform_driver qnoc_driver = {
|
||||
.probe = qcom_icc_rpmh_probe,
|
||||
.remove_new = qcom_icc_rpmh_remove,
|
||||
.remove = qcom_icc_rpmh_remove,
|
||||
.driver = {
|
||||
.name = "qnoc-sa8775p",
|
||||
.of_match_table = qnoc_of_match,
|
||||
|
@ -1807,7 +1807,7 @@ MODULE_DEVICE_TABLE(of, qnoc_of_match);
|
||||
|
||||
static struct platform_driver qnoc_driver = {
|
||||
.probe = qcom_icc_rpmh_probe,
|
||||
.remove_new = qcom_icc_rpmh_remove,
|
||||
.remove = qcom_icc_rpmh_remove,
|
||||
.driver = {
|
||||
.name = "qnoc-sc7180",
|
||||
.of_match_table = qnoc_of_match,
|
||||
|
@ -2111,7 +2111,7 @@ MODULE_DEVICE_TABLE(of, qnoc_of_match);
|
||||
|
||||
static struct platform_driver qnoc_driver = {
|
||||
.probe = qcom_icc_rpmh_probe,
|
||||
.remove_new = qcom_icc_rpmh_remove,
|
||||
.remove = qcom_icc_rpmh_remove,
|
||||
.driver = {
|
||||
.name = "qnoc-sc7280",
|
||||
.of_match_table = qnoc_of_match,
|
||||
|
@ -1889,7 +1889,7 @@ MODULE_DEVICE_TABLE(of, qnoc_of_match);
|
||||
|
||||
static struct platform_driver qnoc_driver = {
|
||||
.probe = qcom_icc_rpmh_probe,
|
||||
.remove_new = qcom_icc_rpmh_remove,
|
||||
.remove = qcom_icc_rpmh_remove,
|
||||
.driver = {
|
||||
.name = "qnoc-sc8180x",
|
||||
.of_match_table = qnoc_of_match,
|
||||
|
@ -2391,7 +2391,7 @@ MODULE_DEVICE_TABLE(of, qnoc_of_match);
|
||||
|
||||
static struct platform_driver qnoc_driver = {
|
||||
.probe = qcom_icc_rpmh_probe,
|
||||
.remove_new = qcom_icc_rpmh_remove,
|
||||
.remove = qcom_icc_rpmh_remove,
|
||||
.driver = {
|
||||
.name = "qnoc-sc8280xp",
|
||||
.of_match_table = qnoc_of_match,
|
||||
|
@ -1714,7 +1714,7 @@ MODULE_DEVICE_TABLE(of, sdm660_noc_of_match);
|
||||
|
||||
static struct platform_driver sdm660_noc_driver = {
|
||||
.probe = qnoc_probe,
|
||||
.remove_new = qnoc_remove,
|
||||
.remove = qnoc_remove,
|
||||
.driver = {
|
||||
.name = "qnoc-sdm660",
|
||||
.of_match_table = sdm660_noc_of_match,
|
||||
|
@ -1533,7 +1533,7 @@ MODULE_DEVICE_TABLE(of, qnoc_of_match);
|
||||
|
||||
static struct platform_driver qnoc_driver = {
|
||||
.probe = qcom_icc_rpmh_probe,
|
||||
.remove_new = qcom_icc_rpmh_remove,
|
||||
.remove = qcom_icc_rpmh_remove,
|
||||
.driver = {
|
||||
.name = "qnoc-sdm670",
|
||||
.of_match_table = qnoc_of_match,
|
||||
|
@ -1802,7 +1802,7 @@ MODULE_DEVICE_TABLE(of, qnoc_of_match);
|
||||
|
||||
static struct platform_driver qnoc_driver = {
|
||||
.probe = qcom_icc_rpmh_probe,
|
||||
.remove_new = qcom_icc_rpmh_remove,
|
||||
.remove = qcom_icc_rpmh_remove,
|
||||
.driver = {
|
||||
.name = "qnoc-sdm845",
|
||||
.of_match_table = qnoc_of_match,
|
||||
|
@ -913,7 +913,7 @@ MODULE_DEVICE_TABLE(of, qnoc_of_match);
|
||||
|
||||
static struct platform_driver qnoc_driver = {
|
||||
.probe = qcom_icc_rpmh_probe,
|
||||
.remove_new = qcom_icc_rpmh_remove,
|
||||
.remove = qcom_icc_rpmh_remove,
|
||||
.driver = {
|
||||
.name = "qnoc-sdx55",
|
||||
.of_match_table = qnoc_of_match,
|
||||
|
@ -897,7 +897,7 @@ MODULE_DEVICE_TABLE(of, qnoc_of_match);
|
||||
|
||||
static struct platform_driver qnoc_driver = {
|
||||
.probe = qcom_icc_rpmh_probe,
|
||||
.remove_new = qcom_icc_rpmh_remove,
|
||||
.remove = qcom_icc_rpmh_remove,
|
||||
.driver = {
|
||||
.name = "qnoc-sdx65",
|
||||
.of_match_table = qnoc_of_match,
|
||||
|
@ -1083,7 +1083,7 @@ MODULE_DEVICE_TABLE(of, qnoc_of_match);
|
||||
|
||||
static struct platform_driver qnoc_driver = {
|
||||
.probe = qcom_icc_rpmh_probe,
|
||||
.remove_new = qcom_icc_rpmh_remove,
|
||||
.remove = qcom_icc_rpmh_remove,
|
||||
.driver = {
|
||||
.name = "qnoc-sdx75",
|
||||
.of_match_table = qnoc_of_match,
|
||||
|
@ -1402,7 +1402,7 @@ MODULE_DEVICE_TABLE(of, qnoc_of_match);
|
||||
|
||||
static struct platform_driver qnoc_driver = {
|
||||
.probe = qnoc_probe,
|
||||
.remove_new = qnoc_remove,
|
||||
.remove = qnoc_remove,
|
||||
.driver = {
|
||||
.name = "qnoc-sm6115",
|
||||
.of_match_table = qnoc_of_match,
|
||||
|
@ -1702,7 +1702,7 @@ MODULE_DEVICE_TABLE(of, qnoc_of_match);
|
||||
|
||||
static struct platform_driver qnoc_driver = {
|
||||
.probe = qcom_icc_rpmh_probe,
|
||||
.remove_new = qcom_icc_rpmh_remove,
|
||||
.remove = qcom_icc_rpmh_remove,
|
||||
.driver = {
|
||||
.name = "qnoc-sm6350",
|
||||
.of_match_table = qnoc_of_match,
|
||||
|
@ -1730,7 +1730,7 @@ MODULE_DEVICE_TABLE(of, qnoc_of_match);
|
||||
|
||||
static struct platform_driver qnoc_driver = {
|
||||
.probe = qcom_icc_rpmh_probe,
|
||||
.remove_new = qcom_icc_rpmh_remove,
|
||||
.remove = qcom_icc_rpmh_remove,
|
||||
.driver = {
|
||||
.name = "qnoc-sm7150",
|
||||
.of_match_table = qnoc_of_match,
|
||||
|
@ -1864,7 +1864,7 @@ MODULE_DEVICE_TABLE(of, qnoc_of_match);
|
||||
|
||||
static struct platform_driver qnoc_driver = {
|
||||
.probe = qcom_icc_rpmh_probe,
|
||||
.remove_new = qcom_icc_rpmh_remove,
|
||||
.remove = qcom_icc_rpmh_remove,
|
||||
.driver = {
|
||||
.name = "qnoc-sm8150",
|
||||
.of_match_table = qnoc_of_match,
|
||||
|
@ -1991,7 +1991,7 @@ MODULE_DEVICE_TABLE(of, qnoc_of_match);
|
||||
|
||||
static struct platform_driver qnoc_driver = {
|
||||
.probe = qcom_icc_rpmh_probe,
|
||||
.remove_new = qcom_icc_rpmh_remove,
|
||||
.remove = qcom_icc_rpmh_remove,
|
||||
.driver = {
|
||||
.name = "qnoc-sm8250",
|
||||
.of_match_table = qnoc_of_match,
|
||||
|
@ -1807,7 +1807,7 @@ MODULE_DEVICE_TABLE(of, qnoc_of_match);
|
||||
|
||||
static struct platform_driver qnoc_driver = {
|
||||
.probe = qcom_icc_rpmh_probe,
|
||||
.remove_new = qcom_icc_rpmh_remove,
|
||||
.remove = qcom_icc_rpmh_remove,
|
||||
.driver = {
|
||||
.name = "qnoc-sm8350",
|
||||
.of_match_table = qnoc_of_match,
|
||||
|
@ -1884,7 +1884,7 @@ MODULE_DEVICE_TABLE(of, qnoc_of_match);
|
||||
|
||||
static struct platform_driver qnoc_driver = {
|
||||
.probe = qcom_icc_rpmh_probe,
|
||||
.remove_new = qcom_icc_rpmh_remove,
|
||||
.remove = qcom_icc_rpmh_remove,
|
||||
.driver = {
|
||||
.name = "qnoc-sm8450",
|
||||
.of_match_table = qnoc_of_match,
|
||||
|
@ -1645,7 +1645,7 @@ MODULE_DEVICE_TABLE(of, qnoc_of_match);
|
||||
|
||||
static struct platform_driver qnoc_driver = {
|
||||
.probe = qcom_icc_rpmh_probe,
|
||||
.remove_new = qcom_icc_rpmh_remove,
|
||||
.remove = qcom_icc_rpmh_remove,
|
||||
.driver = {
|
||||
.name = "qnoc-sm8550",
|
||||
.of_match_table = qnoc_of_match,
|
||||
|
@ -1650,7 +1650,7 @@ MODULE_DEVICE_TABLE(of, qnoc_of_match);
|
||||
|
||||
static struct platform_driver qnoc_driver = {
|
||||
.probe = qcom_icc_rpmh_probe,
|
||||
.remove_new = qcom_icc_rpmh_remove,
|
||||
.remove = qcom_icc_rpmh_remove,
|
||||
.driver = {
|
||||
.name = "qnoc-sm8650",
|
||||
.of_match_table = qnoc_of_match,
|
||||
|
@ -85,7 +85,7 @@ static struct platform_driver qcom_interconnect_rpm_smd_driver = {
|
||||
.name = "icc_smd_rpm",
|
||||
},
|
||||
.probe = qcom_icc_rpm_smd_probe,
|
||||
.remove_new = qcom_icc_rpm_smd_remove,
|
||||
.remove = qcom_icc_rpm_smd_remove,
|
||||
};
|
||||
module_platform_driver(qcom_interconnect_rpm_smd_driver);
|
||||
MODULE_AUTHOR("Georgi Djakov <georgi.djakov@linaro.org>");
|
||||
|
@ -1964,7 +1964,7 @@ MODULE_DEVICE_TABLE(of, qnoc_of_match);
|
||||
|
||||
static struct platform_driver qnoc_driver = {
|
||||
.probe = qcom_icc_rpmh_probe,
|
||||
.remove_new = qcom_icc_rpmh_remove,
|
||||
.remove = qcom_icc_rpmh_remove,
|
||||
.driver = {
|
||||
.name = "qnoc-x1e80100",
|
||||
.of_match_table = qnoc_of_match,
|
||||
|
@ -180,7 +180,7 @@ static struct platform_driver exynos_generic_icc_driver = {
|
||||
.sync_state = icc_sync_state,
|
||||
},
|
||||
.probe = exynos_generic_icc_probe,
|
||||
.remove_new = exynos_generic_icc_remove,
|
||||
.remove = exynos_generic_icc_remove,
|
||||
};
|
||||
module_platform_driver(exynos_generic_icc_driver);
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user