Skip to content

Commit ad64a7c

Browse files
ukleinekmathieupoirier
authored andcommitted
remoteproc: Switch back to struct platform_driver::remove()
After commit 0edb555 ("platform: Make platform_driver::remove() return void") .remove() is (again) the right callback to implement for platform drivers. Convert all platform drivers below drivers/remoteproc 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/20241025131340.258233-2-u.kleine-koenig@baylibre.com Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
1 parent 3a8c30e commit ad64a7c

18 files changed

Lines changed: 18 additions & 18 deletions

drivers/remoteproc/da8xx_remoteproc.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -365,7 +365,7 @@ MODULE_DEVICE_TABLE(of, davinci_rproc_of_match);
365365

366366
static struct platform_driver da8xx_rproc_driver = {
367367
.probe = da8xx_rproc_probe,
368-
.remove_new = da8xx_rproc_remove,
368+
.remove = da8xx_rproc_remove,
369369
.driver = {
370370
.name = "davinci-rproc",
371371
.of_match_table = of_match_ptr(davinci_rproc_of_match),

drivers/remoteproc/imx_dsp_rproc.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1258,7 +1258,7 @@ MODULE_DEVICE_TABLE(of, imx_dsp_rproc_of_match);
12581258

12591259
static struct platform_driver imx_dsp_rproc_driver = {
12601260
.probe = imx_dsp_rproc_probe,
1261-
.remove_new = imx_dsp_rproc_remove,
1261+
.remove = imx_dsp_rproc_remove,
12621262
.driver = {
12631263
.name = "imx-dsp-rproc",
12641264
.of_match_table = imx_dsp_rproc_of_match,

drivers/remoteproc/imx_rproc.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1198,7 +1198,7 @@ MODULE_DEVICE_TABLE(of, imx_rproc_of_match);
11981198

11991199
static struct platform_driver imx_rproc_driver = {
12001200
.probe = imx_rproc_probe,
1201-
.remove_new = imx_rproc_remove,
1201+
.remove = imx_rproc_remove,
12021202
.driver = {
12031203
.name = "imx-rproc",
12041204
.of_match_table = imx_rproc_of_match,

drivers/remoteproc/keystone_remoteproc.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -490,7 +490,7 @@ MODULE_DEVICE_TABLE(of, keystone_rproc_of_match);
490490

491491
static struct platform_driver keystone_rproc_driver = {
492492
.probe = keystone_rproc_probe,
493-
.remove_new = keystone_rproc_remove,
493+
.remove = keystone_rproc_remove,
494494
.driver = {
495495
.name = "keystone-rproc",
496496
.of_match_table = keystone_rproc_of_match,

drivers/remoteproc/meson_mx_ao_arc.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@ MODULE_DEVICE_TABLE(of, meson_mx_ao_arc_rproc_match);
246246

247247
static struct platform_driver meson_mx_ao_arc_rproc_driver = {
248248
.probe = meson_mx_ao_arc_rproc_probe,
249-
.remove_new = meson_mx_ao_arc_rproc_remove,
249+
.remove = meson_mx_ao_arc_rproc_remove,
250250
.driver = {
251251
.name = "meson-mx-ao-arc-rproc",
252252
.of_match_table = meson_mx_ao_arc_rproc_match,

drivers/remoteproc/mtk_scp.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1521,7 +1521,7 @@ MODULE_DEVICE_TABLE(of, mtk_scp_of_match);
15211521

15221522
static struct platform_driver mtk_scp_driver = {
15231523
.probe = scp_probe,
1524-
.remove_new = scp_remove,
1524+
.remove = scp_remove,
15251525
.driver = {
15261526
.name = "mtk-scp",
15271527
.of_match_table = mtk_scp_of_match,

drivers/remoteproc/pru_rproc.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1132,7 +1132,7 @@ static struct platform_driver pru_rproc_driver = {
11321132
.suppress_bind_attrs = true,
11331133
},
11341134
.probe = pru_rproc_probe,
1135-
.remove_new = pru_rproc_remove,
1135+
.remove = pru_rproc_remove,
11361136
};
11371137
module_platform_driver(pru_rproc_driver);
11381138

drivers/remoteproc/qcom_q6v5_adsp.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -840,7 +840,7 @@ MODULE_DEVICE_TABLE(of, adsp_of_match);
840840

841841
static struct platform_driver adsp_pil_driver = {
842842
.probe = adsp_probe,
843-
.remove_new = adsp_remove,
843+
.remove = adsp_remove,
844844
.driver = {
845845
.name = "qcom_q6v5_adsp",
846846
.of_match_table = adsp_of_match,

drivers/remoteproc/qcom_q6v5_mss.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2533,7 +2533,7 @@ MODULE_DEVICE_TABLE(of, q6v5_of_match);
25332533

25342534
static struct platform_driver q6v5_driver = {
25352535
.probe = q6v5_probe,
2536-
.remove_new = q6v5_remove,
2536+
.remove = q6v5_remove,
25372537
.driver = {
25382538
.name = "qcom-q6v5-mss",
25392539
.of_match_table = q6v5_of_match,

drivers/remoteproc/qcom_q6v5_pas.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1477,7 +1477,7 @@ MODULE_DEVICE_TABLE(of, adsp_of_match);
14771477

14781478
static struct platform_driver adsp_driver = {
14791479
.probe = adsp_probe,
1480-
.remove_new = adsp_remove,
1480+
.remove = adsp_remove,
14811481
.driver = {
14821482
.name = "qcom_q6v5_pas",
14831483
.of_match_table = adsp_of_match,

0 commit comments

Comments
 (0)