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

Commit Message

Uwe Kleine-König Nov. 30, 2024, 3:05 p.m. UTC

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/fsi 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 drivers, make the alignment of the touched
initializers consistent.

Signed-off-by: Uwe Kleine-König <[e-mail]>
---
Hello,

this is based on Friday's next, feel free to drop changes that result in
a conflict when you come around to apply this. I'll care for the fallout
at a later time then. (Having said that, if you use b4 am -3 and git am
-3, there should be hardly any conflict.)

This is merge window material.

Best regards
Uwe

 drivers/fsi/fsi-master-aspeed.c | 4 ++--
 drivers/fsi/fsi-master-ast-cf.c | 4 ++--
 drivers/fsi/fsi-master-gpio.c   | 4 ++--
 drivers/fsi/fsi-occ.c           | 6 +++---
 4 files changed, 9 insertions(+), 9 deletions(-)


base-commit: f486c8aa16b8172f63bddc70116a0c897a7f3f02

Comments

Uwe Kleine-König Nov. 30, 2024, 5:32 p.m. UTC | #1

Hach,

$Subject ~= s/fsc/fsi/

fixed here in the hope to pass the manual mail filters :-) Please fixup
or ask for a resend.

Best regards
Uwe

Patch

diff --git a/drivers/fsi/fsi-master-aspeed.c b/drivers/fsi/fsi-master-aspeed.c
index 6f5e1bdf7e40..0f66bc8ac2de 100644
--- a/drivers/fsi/fsi-master-aspeed.c
+++ b/drivers/fsi/fsi-master-aspeed.c
@@ -661,12 +661,12 @@  static const struct of_device_id fsi_master_aspeed_match[] = {
 MODULE_DEVICE_TABLE(of, fsi_master_aspeed_match);
 
 static struct platform_driver fsi_master_aspeed_driver = {
-	.driver = {
+	.driver	= {
 		.name		= "fsi-master-aspeed",
 		.of_match_table	= fsi_master_aspeed_match,
 	},
 	.probe	= fsi_master_aspeed_probe,
-	.remove_new = fsi_master_aspeed_remove,
+	.remove	= fsi_master_aspeed_remove,
 };
 
 module_platform_driver(fsi_master_aspeed_driver);
diff --git a/drivers/fsi/fsi-master-ast-cf.c b/drivers/fsi/fsi-master-ast-cf.c
index a4c37ff8edd6..4ed2f33284cf 100644
--- a/drivers/fsi/fsi-master-ast-cf.c
+++ b/drivers/fsi/fsi-master-ast-cf.c
@@ -1429,12 +1429,12 @@  static const struct of_device_id fsi_master_acf_match[] = {
 MODULE_DEVICE_TABLE(of, fsi_master_acf_match);
 
 static struct platform_driver fsi_master_acf = {
-	.driver = {
+	.driver	= {
 		.name		= "fsi-master-acf",
 		.of_match_table	= fsi_master_acf_match,
 	},
 	.probe	= fsi_master_acf_probe,
-	.remove_new = fsi_master_acf_remove,
+	.remove	= fsi_master_acf_remove,
 };
 
 module_platform_driver(fsi_master_acf);
diff --git a/drivers/fsi/fsi-master-gpio.c b/drivers/fsi/fsi-master-gpio.c
index f761344f4873..9f8bfc43ad93 100644
--- a/drivers/fsi/fsi-master-gpio.c
+++ b/drivers/fsi/fsi-master-gpio.c
@@ -883,12 +883,12 @@  static const struct of_device_id fsi_master_gpio_match[] = {
 MODULE_DEVICE_TABLE(of, fsi_master_gpio_match);
 
 static struct platform_driver fsi_master_gpio_driver = {
-	.driver = {
+	.driver	= {
 		.name		= "fsi-master-gpio",
 		.of_match_table	= fsi_master_gpio_match,
 	},
 	.probe	= fsi_master_gpio_probe,
-	.remove_new = fsi_master_gpio_remove,
+	.remove	= fsi_master_gpio_remove,
 };
 
 module_platform_driver(fsi_master_gpio_driver);
diff --git a/drivers/fsi/fsi-occ.c b/drivers/fsi/fsi-occ.c
index a6d4c8f123a5..b5a7372a680c 100644
--- a/drivers/fsi/fsi-occ.c
+++ b/drivers/fsi/fsi-occ.c
@@ -737,10 +737,10 @@  MODULE_DEVICE_TABLE(of, occ_match);
 static struct platform_driver occ_driver = {
 	.driver = {
 		.name = "occ",
-		.of_match_table	= occ_match,
+		.of_match_table = occ_match,
 	},
-	.probe	= occ_probe,
-	.remove_new = occ_remove,
+	.probe = occ_probe,
+	.remove = occ_remove,
 };
 
 static int occ_init(void)