mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2024-12-28 16:53:49 +00:00
scsi: Switch back to struct platform_driver::remove()
After commit 0edb555a65
("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>
This commit is contained in:
parent
53b550de46
commit
f8da4c1cad
@ -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",
|
||||
},
|
||||
};
|
||||
|
||||
|
@ -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",
|
||||
},
|
||||
};
|
||||
|
||||
|
@ -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,
|
||||
},
|
||||
|
@ -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)
|
||||
|
@ -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,
|
||||
|
@ -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,
|
||||
|
@ -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",
|
||||
},
|
||||
|
@ -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,
|
||||
},
|
||||
|
@ -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,
|
||||
},
|
||||
|
@ -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)
|
||||
|
@ -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);
|
||||
|
||||
|
@ -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",
|
||||
}
|
||||
|
@ -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",
|
||||
},
|
||||
|
@ -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,
|
||||
},
|
||||
|
@ -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",
|
||||
},
|
||||
|
@ -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);
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user