linux-kernel - [PATCH] auxdisplay: Switch back to struct platform

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-ID: <20241130145727.900020-2-u.kleine-koenig@baylibre.com>
Date: Sat, 30 Nov 2024 15:57:27 +0100
From: Uwe Kleine-König <u.kleine-koenig@...libre.com>
To: Andy Shevchenko <andy@...nel.org>
Cc: Miguel Ojeda <ojeda@...nel.org>,
	Geert Uytterhoeven <geert@...ux-m68k.org>,
	Paul Burton <paulburton@...nel.org>,
	Erick Archer <erick.archer@...look.com>,
	Chris Packham <chris.packham@...iedtelesis.co.nz>,
	linux-kernel@...r.kernel.org
Subject: [PATCH] auxdisplay: 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/auxdisplay 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 <u.kleine-koenig@...libre.com>
---
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/auxdisplay/cfag12864bfb.c  | 6 +++---
 drivers/auxdisplay/hd44780.c       | 6 +++---
 drivers/auxdisplay/img-ascii-lcd.c | 4 ++--
 drivers/auxdisplay/seg-led-gpio.c  | 2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/drivers/auxdisplay/cfag12864bfb.c b/drivers/auxdisplay/cfag12864bfb.c
index 2b74dabe7e17..471ec6c7d459 100644
--- a/drivers/auxdisplay/cfag12864bfb.c
+++ b/drivers/auxdisplay/cfag12864bfb.c
@@ -107,10 +107,10 @@ static void cfag12864bfb_remove(struct platform_device *device)
 }
 
 static struct platform_driver cfag12864bfb_driver = {
-	.probe	= cfag12864bfb_probe,
-	.remove_new = cfag12864bfb_remove,
+	.probe = cfag12864bfb_probe,
+	.remove = cfag12864bfb_remove,
 	.driver = {
-		.name	= CFAG12864BFB_NAME,
+		.name = CFAG12864BFB_NAME,
 	},
 };
 
diff --git a/drivers/auxdisplay/hd44780.c b/drivers/auxdisplay/hd44780.c
index 025dc6855cb2..edbb4bcfb6c3 100644
--- a/drivers/auxdisplay/hd44780.c
+++ b/drivers/auxdisplay/hd44780.c
@@ -339,9 +339,9 @@ MODULE_DEVICE_TABLE(of, hd44780_of_match);
 
 static struct platform_driver hd44780_driver = {
 	.probe = hd44780_probe,
-	.remove_new = hd44780_remove,
-	.driver		= {
-		.name	= "hd44780",
+	.remove = hd44780_remove,
+	.driver = {
+		.name = "hd44780",
 		.of_match_table = hd44780_of_match,
 	},
 };
diff --git a/drivers/auxdisplay/img-ascii-lcd.c b/drivers/auxdisplay/img-ascii-lcd.c
index 9ba132dc6143..71bd834b83c7 100644
--- a/drivers/auxdisplay/img-ascii-lcd.c
+++ b/drivers/auxdisplay/img-ascii-lcd.c
@@ -286,12 +286,12 @@ static void img_ascii_lcd_remove(struct platform_device *pdev)
 }
 
 static struct platform_driver img_ascii_lcd_driver = {
-	.driver = {
+	.driver	= {
 		.name		= "img-ascii-lcd",
 		.of_match_table	= img_ascii_lcd_matches,
 	},
 	.probe	= img_ascii_lcd_probe,
-	.remove_new = img_ascii_lcd_remove,
+	.remove	= img_ascii_lcd_remove,
 };
 module_platform_driver(img_ascii_lcd_driver);
 
diff --git a/drivers/auxdisplay/seg-led-gpio.c b/drivers/auxdisplay/seg-led-gpio.c
index 183ab3011cbb..d839fe803606 100644
--- a/drivers/auxdisplay/seg-led-gpio.c
+++ b/drivers/auxdisplay/seg-led-gpio.c
@@ -97,7 +97,7 @@ MODULE_DEVICE_TABLE(of, seg_led_of_match);
 
 static struct platform_driver seg_led_driver = {
 	.probe = seg_led_probe,
-	.remove_new = seg_led_remove,
+	.remove = seg_led_remove,
 	.driver = {
 		.name = "seg-led-gpio",
 		.of_match_table = seg_led_of_match,

base-commit: f486c8aa16b8172f63bddc70116a0c897a7f3f02
-- 
2.45.2