Commit f8da4c1c authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Martin K. Petersen
Browse files

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



After commit 0edb555a ("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: default avatarUwe 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: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 53b550de

drivers/scsi/a3000.c

+3 −3
Original line number Diff line number Diff line
@@ -302,7 +302,7 @@ static void __exit amiga_a3000_scsi_remove(struct platform_device *pdev) 
 * triggering a section mismatch warning.

 */

static struct platform_driver amiga_a3000_scsi_driver __refdata = {

	.remove_new = __exit_p(amiga_a3000_scsi_remove),

	.remove = __exit_p(amiga_a3000_scsi_remove),

	.driver = {

		.name = "amiga-a3000-scsi",

	},

drivers/scsi/a4000t.c

+3 −3
Original line number Diff line number Diff line
@@ -115,7 +115,7 @@ static void __exit amiga_a4000t_scsi_remove(struct platform_device *pdev) 
 * triggering a section mismatch warning.

 */

static struct platform_driver amiga_a4000t_scsi_driver __refdata = {

	.remove_new = __exit_p(amiga_a4000t_scsi_remove),

	.remove = __exit_p(amiga_a4000t_scsi_remove),

	.driver = {

		.name = "amiga-a4000t-scsi",

	},

drivers/scsi/atari_scsi.c

+1 −1
Original line number Diff line number Diff line
@@ -885,7 +885,7 @@ static void __exit atari_scsi_remove(struct platform_device *pdev) 
 * triggering a section mismatch warning.

 */

static struct platform_driver atari_scsi_driver __refdata = {

	.remove_new = __exit_p(atari_scsi_remove),

	.remove = __exit_p(atari_scsi_remove),

	.driver = {

		.name	= DRV_MODULE_NAME,

	},

drivers/scsi/bvme6000_scsi.c

+1 −1
Original line number Diff line number Diff line
@@ -106,7 +106,7 @@ static struct platform_driver bvme6000_scsi_driver = { 
		.name		= "bvme6000-scsi",

	},

	.probe		= bvme6000_probe,

	.remove_new	= bvme6000_device_remove,

	.remove		= bvme6000_device_remove,

};



static int __init bvme6000_scsi_init(void)

drivers/scsi/hisi_sas/hisi_sas_v1_hw.c

+1 −1
Original line number Diff line number Diff line
@@ -1802,7 +1802,7 @@ MODULE_DEVICE_TABLE(acpi, sas_v1_acpi_match); 


static struct platform_driver hisi_sas_v1_driver = {

	.probe = hisi_sas_v1_probe,

	.remove_new = hisi_sas_remove,

	.remove = hisi_sas_remove,

	.driver = {

		.name = DRV_NAME,

		.of_match_table = sas_v1_of_match,