Skip to content

Commit f8da4c1

Browse files
ukleinekmartinkpetersen
authored andcommitted
scsi: 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/scsi 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> Link: https://lore.kernel.org/r/20241028080754.429191-2-u.kleine-koenig@baylibre.com Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
1 parent 53b550d commit f8da4c1

16 files changed

+20
-20
lines changed

drivers/scsi/a3000.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -302,9 +302,9 @@ static void __exit amiga_a3000_scsi_remove(struct platform_device *pdev)
302302
* triggering a section mismatch warning.
303303
*/
304304
static struct platform_driver amiga_a3000_scsi_driver __refdata = {
305-
.remove_new = __exit_p(amiga_a3000_scsi_remove),
306-
.driver = {
307-
.name = "amiga-a3000-scsi",
305+
.remove = __exit_p(amiga_a3000_scsi_remove),
306+
.driver = {
307+
.name = "amiga-a3000-scsi",
308308
},
309309
};
310310

drivers/scsi/a4000t.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -115,9 +115,9 @@ static void __exit amiga_a4000t_scsi_remove(struct platform_device *pdev)
115115
* triggering a section mismatch warning.
116116
*/
117117
static struct platform_driver amiga_a4000t_scsi_driver __refdata = {
118-
.remove_new = __exit_p(amiga_a4000t_scsi_remove),
119-
.driver = {
120-
.name = "amiga-a4000t-scsi",
118+
.remove = __exit_p(amiga_a4000t_scsi_remove),
119+
.driver = {
120+
.name = "amiga-a4000t-scsi",
121121
},
122122
};
123123

drivers/scsi/atari_scsi.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -885,7 +885,7 @@ static void __exit atari_scsi_remove(struct platform_device *pdev)
885885
* triggering a section mismatch warning.
886886
*/
887887
static struct platform_driver atari_scsi_driver __refdata = {
888-
.remove_new = __exit_p(atari_scsi_remove),
888+
.remove = __exit_p(atari_scsi_remove),
889889
.driver = {
890890
.name = DRV_MODULE_NAME,
891891
},

drivers/scsi/bvme6000_scsi.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ static struct platform_driver bvme6000_scsi_driver = {
106106
.name = "bvme6000-scsi",
107107
},
108108
.probe = bvme6000_probe,
109-
.remove_new = bvme6000_device_remove,
109+
.remove = bvme6000_device_remove,
110110
};
111111

112112
static int __init bvme6000_scsi_init(void)

drivers/scsi/hisi_sas/hisi_sas_v1_hw.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1802,7 +1802,7 @@ MODULE_DEVICE_TABLE(acpi, sas_v1_acpi_match);
18021802

18031803
static struct platform_driver hisi_sas_v1_driver = {
18041804
.probe = hisi_sas_v1_probe,
1805-
.remove_new = hisi_sas_remove,
1805+
.remove = hisi_sas_remove,
18061806
.driver = {
18071807
.name = DRV_NAME,
18081808
.of_match_table = sas_v1_of_match,

drivers/scsi/hisi_sas/hisi_sas_v2_hw.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3649,7 +3649,7 @@ MODULE_DEVICE_TABLE(acpi, sas_v2_acpi_match);
36493649

36503650
static struct platform_driver hisi_sas_v2_driver = {
36513651
.probe = hisi_sas_v2_probe,
3652-
.remove_new = hisi_sas_remove,
3652+
.remove = hisi_sas_remove,
36533653
.driver = {
36543654
.name = DRV_NAME,
36553655
.of_match_table = sas_v2_of_match,

drivers/scsi/jazz_esp.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ MODULE_ALIAS("platform:jazz_esp");
196196

197197
static struct platform_driver esp_jazz_driver = {
198198
.probe = esp_jazz_probe,
199-
.remove_new = esp_jazz_remove,
199+
.remove = esp_jazz_remove,
200200
.driver = {
201201
.name = "jazz_esp",
202202
},

drivers/scsi/mac_esp.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -432,7 +432,7 @@ static void esp_mac_remove(struct platform_device *dev)
432432

433433
static struct platform_driver esp_mac_driver = {
434434
.probe = esp_mac_probe,
435-
.remove_new = esp_mac_remove,
435+
.remove = esp_mac_remove,
436436
.driver = {
437437
.name = DRV_MODULE_NAME,
438438
},

drivers/scsi/mac_scsi.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -547,7 +547,7 @@ static void __exit mac_scsi_remove(struct platform_device *pdev)
547547
* triggering a section mismatch warning.
548548
*/
549549
static struct platform_driver mac_scsi_driver __refdata = {
550-
.remove_new = __exit_p(mac_scsi_remove),
550+
.remove = __exit_p(mac_scsi_remove),
551551
.driver = {
552552
.name = DRV_MODULE_NAME,
553553
},

drivers/scsi/mvme16x_scsi.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ static struct platform_driver mvme16x_scsi_driver = {
127127
.name = "mvme16x-scsi",
128128
},
129129
.probe = mvme16x_probe,
130-
.remove_new = mvme16x_device_remove,
130+
.remove = mvme16x_device_remove,
131131
};
132132

133133
static int __init mvme16x_scsi_init(void)

0 commit comments

Comments
 (0)