Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

scsi: Switch back to struct platform_driver::remove()

After commit 0edb555a65d1 ("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>

authored by

Uwe Kleine-König and committed by
Martin K. Petersen
f8da4c1c 53b550de

+20 -20
+3 -3
drivers/scsi/a3000.c
··· 302 302 * triggering a section mismatch warning. 303 303 */ 304 304 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", 308 308 }, 309 309 }; 310 310
+3 -3
drivers/scsi/a4000t.c
··· 115 115 * triggering a section mismatch warning. 116 116 */ 117 117 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", 121 121 }, 122 122 }; 123 123
+1 -1
drivers/scsi/atari_scsi.c
··· 885 885 * triggering a section mismatch warning. 886 886 */ 887 887 static struct platform_driver atari_scsi_driver __refdata = { 888 - .remove_new = __exit_p(atari_scsi_remove), 888 + .remove = __exit_p(atari_scsi_remove), 889 889 .driver = { 890 890 .name = DRV_MODULE_NAME, 891 891 },
+1 -1
drivers/scsi/bvme6000_scsi.c
··· 106 106 .name = "bvme6000-scsi", 107 107 }, 108 108 .probe = bvme6000_probe, 109 - .remove_new = bvme6000_device_remove, 109 + .remove = bvme6000_device_remove, 110 110 }; 111 111 112 112 static int __init bvme6000_scsi_init(void)
+1 -1
drivers/scsi/hisi_sas/hisi_sas_v1_hw.c
··· 1802 1802 1803 1803 static struct platform_driver hisi_sas_v1_driver = { 1804 1804 .probe = hisi_sas_v1_probe, 1805 - .remove_new = hisi_sas_remove, 1805 + .remove = hisi_sas_remove, 1806 1806 .driver = { 1807 1807 .name = DRV_NAME, 1808 1808 .of_match_table = sas_v1_of_match,
+1 -1
drivers/scsi/hisi_sas/hisi_sas_v2_hw.c
··· 3649 3649 3650 3650 static struct platform_driver hisi_sas_v2_driver = { 3651 3651 .probe = hisi_sas_v2_probe, 3652 - .remove_new = hisi_sas_remove, 3652 + .remove = hisi_sas_remove, 3653 3653 .driver = { 3654 3654 .name = DRV_NAME, 3655 3655 .of_match_table = sas_v2_of_match,
+1 -1
drivers/scsi/jazz_esp.c
··· 196 196 197 197 static struct platform_driver esp_jazz_driver = { 198 198 .probe = esp_jazz_probe, 199 - .remove_new = esp_jazz_remove, 199 + .remove = esp_jazz_remove, 200 200 .driver = { 201 201 .name = "jazz_esp", 202 202 },
+1 -1
drivers/scsi/mac_esp.c
··· 432 432 433 433 static struct platform_driver esp_mac_driver = { 434 434 .probe = esp_mac_probe, 435 - .remove_new = esp_mac_remove, 435 + .remove = esp_mac_remove, 436 436 .driver = { 437 437 .name = DRV_MODULE_NAME, 438 438 },
+1 -1
drivers/scsi/mac_scsi.c
··· 547 547 * triggering a section mismatch warning. 548 548 */ 549 549 static struct platform_driver mac_scsi_driver __refdata = { 550 - .remove_new = __exit_p(mac_scsi_remove), 550 + .remove = __exit_p(mac_scsi_remove), 551 551 .driver = { 552 552 .name = DRV_MODULE_NAME, 553 553 },
+1 -1
drivers/scsi/mvme16x_scsi.c
··· 127 127 .name = "mvme16x-scsi", 128 128 }, 129 129 .probe = mvme16x_probe, 130 - .remove_new = mvme16x_device_remove, 130 + .remove = mvme16x_device_remove, 131 131 }; 132 132 133 133 static int __init mvme16x_scsi_init(void)
+1 -1
drivers/scsi/qlogicpti.c
··· 1463 1463 .of_match_table = qpti_match, 1464 1464 }, 1465 1465 .probe = qpti_sbus_probe, 1466 - .remove_new = qpti_sbus_remove, 1466 + .remove = qpti_sbus_remove, 1467 1467 }; 1468 1468 module_platform_driver(qpti_sbus_driver); 1469 1469
+1 -1
drivers/scsi/sgiwd93.c
··· 306 306 307 307 static struct platform_driver sgiwd93_driver = { 308 308 .probe = sgiwd93_probe, 309 - .remove_new = sgiwd93_remove, 309 + .remove = sgiwd93_remove, 310 310 .driver = { 311 311 .name = "sgiwd93", 312 312 }
+1 -1
drivers/scsi/sni_53c710.c
··· 119 119 120 120 static struct platform_driver snirm710_driver = { 121 121 .probe = snirm710_probe, 122 - .remove_new = snirm710_driver_remove, 122 + .remove = snirm710_driver_remove, 123 123 .driver = { 124 124 .name = "snirm_53c710", 125 125 },
+1 -1
drivers/scsi/sun3_scsi.c
··· 657 657 } 658 658 659 659 static struct platform_driver sun3_scsi_driver = { 660 - .remove_new = __exit_p(sun3_scsi_remove), 660 + .remove = __exit_p(sun3_scsi_remove), 661 661 .driver = { 662 662 .name = DRV_MODULE_NAME, 663 663 },
+1 -1
drivers/scsi/sun3x_esp.c
··· 265 265 266 266 static struct platform_driver esp_sun3x_driver = { 267 267 .probe = esp_sun3x_probe, 268 - .remove_new = esp_sun3x_remove, 268 + .remove = esp_sun3x_remove, 269 269 .driver = { 270 270 .name = "sun3x_esp", 271 271 },
+1 -1
drivers/scsi/sun_esp.c
··· 603 603 .of_match_table = esp_match, 604 604 }, 605 605 .probe = esp_sbus_probe, 606 - .remove_new = esp_sbus_remove, 606 + .remove = esp_sbus_remove, 607 607 }; 608 608 module_platform_driver(esp_sbus_driver); 609 609