Commit 2d910fe1 authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Niklas Cassel
Browse files

ata: 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/ata/ 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.

While touching these files, make indention of the struct initializer
consistent in several files.

Signed-off-by: default avatarUwe Kleine-König <u.kleine-koenig@baylibre.com>
Reviewed-by: default avatarDamien Le Moal <dlemoal@kernel.org>
Link: https://lore.kernel.org/r/20241016141609.27329-2-u.kleine-koenig@baylibre.com


Signed-off-by: default avatarNiklas Cassel <cassel@kernel.org>
parent f7a870d0

drivers/ata/ahci_brcm.c

+1 −1
Original line number Diff line number Diff line
@@ -571,7 +571,7 @@ static SIMPLE_DEV_PM_OPS(ahci_brcm_pm_ops, brcm_ahci_suspend, brcm_ahci_resume); 


static struct platform_driver brcm_ahci_driver = {

	.probe = brcm_ahci_probe,

	.remove_new = brcm_ahci_remove,

	.remove = brcm_ahci_remove,

	.shutdown = brcm_ahci_shutdown,

	.driver = {

		.name = DRV_NAME,

drivers/ata/ahci_ceva.c

+1 −1
Original line number Diff line number Diff line
@@ -402,7 +402,7 @@ MODULE_DEVICE_TABLE(of, ceva_ahci_of_match); 


static struct platform_driver ceva_ahci_driver = {

	.probe = ceva_ahci_probe,

	.remove_new = ata_platform_remove_one,

	.remove = ata_platform_remove_one,

	.driver = {

		.name = DRV_NAME,

		.of_match_table = ceva_ahci_of_match,

drivers/ata/ahci_da850.c

+1 −1
Original line number Diff line number Diff line
@@ -238,7 +238,7 @@ MODULE_DEVICE_TABLE(of, ahci_da850_of_match); 


static struct platform_driver ahci_da850_driver = {

	.probe = ahci_da850_probe,

	.remove_new = ata_platform_remove_one,

	.remove = ata_platform_remove_one,

	.driver = {

		.name = DRV_NAME,

		.of_match_table = ahci_da850_of_match,

drivers/ata/ahci_dm816.c

+1 −1
Original line number Diff line number Diff line
@@ -182,7 +182,7 @@ MODULE_DEVICE_TABLE(of, ahci_dm816_of_match); 


static struct platform_driver ahci_dm816_driver = {

	.probe = ahci_dm816_probe,

	.remove_new = ata_platform_remove_one,

	.remove = ata_platform_remove_one,

	.driver = {

		.name = AHCI_DM816_DRV_NAME,

		.of_match_table = ahci_dm816_of_match,

drivers/ata/ahci_dwc.c

+1 −1
Original line number Diff line number Diff line
@@ -478,7 +478,7 @@ MODULE_DEVICE_TABLE(of, ahci_dwc_of_match); 


static struct platform_driver ahci_dwc_driver = {

	.probe = ahci_dwc_probe,

	.remove_new = ata_platform_remove_one,

	.remove = ata_platform_remove_one,

	.shutdown = ahci_platform_shutdown,

	.driver = {

		.name = DRV_NAME,