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>

diff --git a/drivers/scsi/a3000.c b/drivers/scsi/a3000.c
index ad39797890e59a004f96c8e2d35e0e0482f08b7a..bf054dd7682bf119dd33fd5c09976553c2a77bac 100644 (file)
--- a/drivers/scsi/a3000.c
+++ b/drivers/scsi/a3000.c
@@ -302,9 +302,9 @@ 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),
-       .driver   = {
-               .name   = "amiga-a3000-scsi",
+       .remove = __exit_p(amiga_a3000_scsi_remove),
+       .driver = {
+               .name = "amiga-a3000-scsi",
        },
 };
 

diff --git a/drivers/scsi/a4000t.c b/drivers/scsi/a4000t.c
index d9103adc87fef49d838f0cfc90e7c97d4a336e49..75b43047a1558174e66e2cabf4d94289f18627a1 100644 (file)
--- a/drivers/scsi/a4000t.c
+++ b/drivers/scsi/a4000t.c
@@ -115,9 +115,9 @@ 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),
-       .driver   = {
-               .name   = "amiga-a4000t-scsi",
+       .remove = __exit_p(amiga_a4000t_scsi_remove),
+       .driver = {
+               .name = "amiga-a4000t-scsi",
        },
 };
 

diff --git a/drivers/scsi/atari_scsi.c b/drivers/scsi/atari_scsi.c
index 98a1b966a0b078fd6df8fb46fbd5f1a5ccb7e6a9..85055677666c51e806558f1be8328663ef2012ce 100644 (file)
--- a/drivers/scsi/atari_scsi.c
+++ b/drivers/scsi/atari_scsi.c
@@ -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,
        },

diff --git a/drivers/scsi/bvme6000_scsi.c b/drivers/scsi/bvme6000_scsi.c
index f893e9779e9de73a9a66935db80d4acfac33ec50..baf5f4e479378d97b6c65fb39e0ac3f0ae522ab3 100644 (file)
--- a/drivers/scsi/bvme6000_scsi.c
+++ b/drivers/scsi/bvme6000_scsi.c
@@ -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)

diff --git a/drivers/scsi/hisi_sas/hisi_sas_v1_hw.c b/drivers/scsi/hisi_sas/hisi_sas_v1_hw.c
index 70bba55bc5d0239fdf410ed60ad77d5837737746..c3e571be22220ae48fab4736eb55e4d939736283 100644 (file)
--- a/drivers/scsi/hisi_sas/hisi_sas_v1_hw.c
+++ b/drivers/scsi/hisi_sas/hisi_sas_v1_hw.c
@@ -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,

diff --git a/drivers/scsi/hisi_sas/hisi_sas_v2_hw.c b/drivers/scsi/hisi_sas/hisi_sas_v2_hw.c
index ab6668dc5b77c9f172c1b2a0038d705c126af6b5..1a62b5d15eca720fff3c4f9ccaa7e293015d2622 100644 (file)
--- a/drivers/scsi/hisi_sas/hisi_sas_v2_hw.c
+++ b/drivers/scsi/hisi_sas/hisi_sas_v2_hw.c
@@ -3649,7 +3649,7 @@ MODULE_DEVICE_TABLE(acpi, sas_v2_acpi_match);
 
 static struct platform_driver hisi_sas_v2_driver = {
        .probe = hisi_sas_v2_probe,
-       .remove_new = hisi_sas_remove,
+       .remove = hisi_sas_remove,
        .driver = {
                .name = DRV_NAME,
                .of_match_table = sas_v2_of_match,

diff --git a/drivers/scsi/jazz_esp.c b/drivers/scsi/jazz_esp.c
index fb04b0b515ab1fa76a8e6d76878ff091fd701ec4..35137f5cfb3a8122307ec57ca121d759c73cdbbb 100644 (file)
--- a/drivers/scsi/jazz_esp.c
+++ b/drivers/scsi/jazz_esp.c
@@ -196,7 +196,7 @@ MODULE_ALIAS("platform:jazz_esp");
 
 static struct platform_driver esp_jazz_driver = {
        .probe          = esp_jazz_probe,
-       .remove_new     = esp_jazz_remove,
+       .remove         = esp_jazz_remove,
        .driver = {
                .name   = "jazz_esp",
        },

diff --git a/drivers/scsi/mac_esp.c b/drivers/scsi/mac_esp.c
index 187ae0a65d404efd485767928a0126ac366eb679..ff0253d47a0e88f6a9c8913cd39d85999c85a916 100644 (file)
--- a/drivers/scsi/mac_esp.c
+++ b/drivers/scsi/mac_esp.c
@@ -432,7 +432,7 @@ static void esp_mac_remove(struct platform_device *dev)
 
 static struct platform_driver esp_mac_driver = {
        .probe    = esp_mac_probe,
-       .remove_new = esp_mac_remove,
+       .remove   = esp_mac_remove,
        .driver   = {
                .name   = DRV_MODULE_NAME,
        },

diff --git a/drivers/scsi/mac_scsi.c b/drivers/scsi/mac_scsi.c
index f225bb20aa2201c897a71dc80bc6afdc33c4dce7..a86bd839d08e9e7a5c7ef55a695da895e5892951 100644 (file)
--- a/drivers/scsi/mac_scsi.c
+++ b/drivers/scsi/mac_scsi.c
@@ -547,7 +547,7 @@ static void __exit mac_scsi_remove(struct platform_device *pdev)
  * triggering a section mismatch warning.
  */
 static struct platform_driver mac_scsi_driver __refdata = {
-       .remove_new = __exit_p(mac_scsi_remove),
+       .remove = __exit_p(mac_scsi_remove),
        .driver = {
                .name   = DRV_MODULE_NAME,
        },

diff --git a/drivers/scsi/mvme16x_scsi.c b/drivers/scsi/mvme16x_scsi.c
index e08a38e2a442b6c959f0a7a45f4a0285c2b5fb74..9b19d5205e508cea2f318935e0f96700b03b1edc 100644 (file)
--- a/drivers/scsi/mvme16x_scsi.c
+++ b/drivers/scsi/mvme16x_scsi.c
@@ -127,7 +127,7 @@ static struct platform_driver mvme16x_scsi_driver = {
                .name           = "mvme16x-scsi",
        },
        .probe          = mvme16x_probe,
-       .remove_new     = mvme16x_device_remove,
+       .remove         = mvme16x_device_remove,
 };
 
 static int __init mvme16x_scsi_init(void)

diff --git a/drivers/scsi/qlogicpti.c b/drivers/scsi/qlogicpti.c
index 6177f4798f3ac98123ec6e4d5b0fedf3c13faea5..74866b9f2b1452b196bdfe651b057a6fc9a76690 100644 (file)
--- a/drivers/scsi/qlogicpti.c
+++ b/drivers/scsi/qlogicpti.c
@@ -1463,7 +1463,7 @@ static struct platform_driver qpti_sbus_driver = {
                .of_match_table = qpti_match,
        },
        .probe          = qpti_sbus_probe,
-       .remove_new     = qpti_sbus_remove,
+       .remove         = qpti_sbus_remove,
 };
 module_platform_driver(qpti_sbus_driver);
 

diff --git a/drivers/scsi/sgiwd93.c b/drivers/scsi/sgiwd93.c
index b0bef83db7b60e80fe8fed673edbc6249f84594c..6594661db5f407e48d05513b3d9de4c463d8ef89 100644 (file)
--- a/drivers/scsi/sgiwd93.c
+++ b/drivers/scsi/sgiwd93.c
@@ -306,7 +306,7 @@ static void sgiwd93_remove(struct platform_device *pdev)
 
 static struct platform_driver sgiwd93_driver = {
        .probe  = sgiwd93_probe,
-       .remove_new = sgiwd93_remove,
+       .remove = sgiwd93_remove,
        .driver = {
                .name   = "sgiwd93",
        }

diff --git a/drivers/scsi/sni_53c710.c b/drivers/scsi/sni_53c710.c
index 9df1c90a24c11b03636df13df87d33ab40f62b9b..d1d2556c8fc4b2d9919eea8dd70cfe1aeabdafbb 100644 (file)
--- a/drivers/scsi/sni_53c710.c
+++ b/drivers/scsi/sni_53c710.c
@@ -119,7 +119,7 @@ static void snirm710_driver_remove(struct platform_device *dev)
 
 static struct platform_driver snirm710_driver = {
        .probe  = snirm710_probe,
-       .remove_new = snirm710_driver_remove,
+       .remove = snirm710_driver_remove,
        .driver = {
                .name   = "snirm_53c710",
        },

diff --git a/drivers/scsi/sun3_scsi.c b/drivers/scsi/sun3_scsi.c
index fffc0fa525940cee76750c5c6bc563e5ccd78e33..bb47274d920dc773f4e789edf4a6af6482da1e01 100644 (file)
--- a/drivers/scsi/sun3_scsi.c
+++ b/drivers/scsi/sun3_scsi.c
@@ -657,7 +657,7 @@ static void __exit sun3_scsi_remove(struct platform_device *pdev)
 }
 
 static struct platform_driver sun3_scsi_driver = {
-       .remove_new = __exit_p(sun3_scsi_remove),
+       .remove = __exit_p(sun3_scsi_remove),
        .driver = {
                .name   = DRV_MODULE_NAME,
        },

diff --git a/drivers/scsi/sun3x_esp.c b/drivers/scsi/sun3x_esp.c
index e20f314cf3e7d7b37023917d506aaef906bef04d..365406885b8ef50b1ac1c5c03f603fcd7f538405 100644 (file)
--- a/drivers/scsi/sun3x_esp.c
+++ b/drivers/scsi/sun3x_esp.c
@@ -265,7 +265,7 @@ static void esp_sun3x_remove(struct platform_device *dev)
 
 static struct platform_driver esp_sun3x_driver = {
        .probe          = esp_sun3x_probe,
-       .remove_new     = esp_sun3x_remove,
+       .remove         = esp_sun3x_remove,
        .driver = {
                .name   = "sun3x_esp",
        },

diff --git a/drivers/scsi/sun_esp.c b/drivers/scsi/sun_esp.c
index 5ce6c9d19d1e619b2717a135eef450eb8c7d710f..aa430501f0c7192c064eeb3cc9c013b829632728 100644 (file)
--- a/drivers/scsi/sun_esp.c
+++ b/drivers/scsi/sun_esp.c
@@ -603,7 +603,7 @@ static struct platform_driver esp_sbus_driver = {
                .of_match_table = esp_match,
        },
        .probe          = esp_sbus_probe,
-       .remove_new     = esp_sbus_remove,
+       .remove         = esp_sbus_remove,
 };
 module_platform_driver(esp_sbus_driver);