backlight: Switch i2c drivers back to use .probe()

PATCH Applied Uwe Kleine-König 2 participants 2 messages May 21, 2023 – May 25, 2023

Subsystems (4)

Framebuffer layer Backlight class/subsystem ADP8860 backlight driver (ADP8860/ADP8861/ADP8863) KTZ8866 backlight driver

lore

Share & tools

lore

Uwe Kleine-König

author

2023-05-21 14:39 UTC #0 lore raw

PATCH 1/1 backlight: Switch i2c drivers back to use .probe()

After commit b8a1a4cd5a98 ("i2c: Provide a temporary .probe_new() call-back type"), all drivers being converted to .probe_new() and then 03c835f498b5 ("i2c: Switch .probe() to not take an id parameter") convert back to (the new) .probe() to be able to eventually drop .probe_new() from struct i2c_driver.

Also fix two indention inconsistencies in the neighbourhood.

Signed-off-by Uwe Kleine-König <[email protected]>

---
Hello,

this patch was generated using coccinelle, but I aligned the result to the per-file indention.

This is one patch for the whole backlight subsystem. If you want it split per driver for improved patch count numbers, please tell me.

Currently there are no changes to drivers/video/backlight in next, so the change should apply fine. If however there are other changes that result in conflicts, feel free to just drop the hunks in the relevant files and apply anyhow. I'll care about the fallout later.

Best regards
Uwe

 drivers/video/backlight/adp8860_bl.c | 4 ++--
 drivers/video/backlight/adp8870_bl.c | 4 ++--
 drivers/video/backlight/arcxcnn_bl.c | 2 +-
 drivers/video/backlight/bd6107.c     | 2 +-
 drivers/video/backlight/ktz8866.c    | 2 +-
 drivers/video/backlight/lm3630a_bl.c | 2 +-
 drivers/video/backlight/lm3639_bl.c  | 2 +-
 drivers/video/backlight/lp855x_bl.c  | 2 +-
 drivers/video/backlight/lv5207lp.c   | 2 +-
 9 files changed, 11 insertions(+), 11 deletions(-)

drivers/video/backlight/adp8860_bl.c +2 -2

index a479aab90f78..f51ada4795e8 100644
@@ -803,8 +803,8 @@ static struct i2c_driver adp8860_driver = {
 		.name	= KBUILD_MODNAME,
 		.pm	= &adp8860_i2c_pm_ops,
 	},
-	.probe_new = adp8860_probe,
-	.remove   = adp8860_remove,
+	.probe = adp8860_probe,
+	.remove = adp8860_remove,
 	.id_table = adp8860_id,
 };

drivers/video/backlight/adp8870_bl.c +2 -2

index d6b0007db649..6bb18dc970e9 100644
@@ -973,8 +973,8 @@ static struct i2c_driver adp8870_driver = {
 		.name	= KBUILD_MODNAME,
 		.pm	= &adp8870_i2c_pm_ops,
 	},
-	.probe_new = adp8870_probe,
-	.remove   = adp8870_remove,
+	.probe = adp8870_probe,
+	.remove = adp8870_remove,
 	.id_table = adp8870_id,
 };

drivers/video/backlight/arcxcnn_bl.c +1 -1

index 088bcca547dd..1d5a570cfe02 100644
@@ -392,7 +392,7 @@ static struct i2c_driver arcxcnn_driver = {
 		.name = "arcxcnn_bl",
 		.of_match_table = arcxcnn_dt_ids,
 	},
-	.probe_new = arcxcnn_probe,
+	.probe = arcxcnn_probe,
 	.remove = arcxcnn_remove,
 	.id_table = arcxcnn_ids,
 };

drivers/video/backlight/bd6107.c +1 -1

index f4db6c064635..7df25faa07a5 100644
@@ -192,7 +192,7 @@ static struct i2c_driver bd6107_driver = {
 	.driver = {
 		.name = "bd6107",
 	},
-	.probe_new = bd6107_probe,
+	.probe = bd6107_probe,
 	.remove = bd6107_remove,
 	.id_table = bd6107_ids,
 };

drivers/video/backlight/ktz8866.c +1 -1

index d38c13ad39c7..9c980f2571ee 100644
@@ -196,7 +196,7 @@ static struct i2c_driver ktz8866_driver = {
 		.name = "ktz8866",
 		.of_match_table = ktz8866_match_table,
 	},
-	.probe_new = ktz8866_probe,
+	.probe = ktz8866_probe,
 	.remove = ktz8866_remove,
 	.id_table = ktz8866_ids,
 };

drivers/video/backlight/lm3630a_bl.c +1 -1

index d8c42acecb5d..74d4269d5be5 100644
@@ -616,7 +616,7 @@ static struct i2c_driver lm3630a_i2c_driver = {
 		   .name = LM3630A_NAME,
 		   .of_match_table = lm3630a_match_table,
 		   },
-	.probe_new = lm3630a_probe,
+	.probe = lm3630a_probe,
 	.remove = lm3630a_remove,
 	.id_table = lm3630a_id,
 };

drivers/video/backlight/lm3639_bl.c +1 -1

index a836628ce06e..5246c171497d 100644
@@ -411,7 +411,7 @@ static struct i2c_driver lm3639_i2c_driver = {
 	.driver = {
 		   .name = LM3639_NAME,
 		   },
-	.probe_new = lm3639_probe,
+	.probe = lm3639_probe,
 	.remove = lm3639_remove,
 	.id_table = lm3639_id,
 };

drivers/video/backlight/lp855x_bl.c +1 -1

index a57c9ef3b1cc..caac1cfacbe8 100644
@@ -587,7 +587,7 @@ static struct i2c_driver lp855x_driver = {
 		   .of_match_table = of_match_ptr(lp855x_dt_ids),
 		   .acpi_match_table = ACPI_PTR(lp855x_acpi_match),
 		   },
-	.probe_new = lp855x_probe,
+	.probe = lp855x_probe,
 	.remove = lp855x_remove,
 	.id_table = lp855x_ids,
 };

drivers/video/backlight/lv5207lp.c +1 -1

index 00673c8b66ac..56695ce67e48 100644
@@ -141,7 +141,7 @@ static struct i2c_driver lv5207lp_driver = {
 	.driver = {
 		.name = "lv5207lp",
 	},
-	.probe_new = lv5207lp_probe,
+	.probe = lv5207lp_probe,
 	.remove = lv5207lp_remove,
 	.id_table = lv5207lp_ids,
 };

base-commit: ac9a78681b921877518763ba0e89202254349d1b

Signature · 1 line

2.39.2

Lee Jones

maintainer Applied

2023-05-25 11:24 UTC #1 lore raw

Quoted 27 lines · Uwe Kleine-König

After commit b8a1a4cd5a98 ("i2c: Provide a temporary .probe_new() call-back type"), all drivers being converted to .probe_new() and then 03c835f498b5 ("i2c: Switch .probe() to not take an id parameter") convert back to (the new) .probe() to be able to eventually drop .probe_new() from struct i2c_driver.
Also fix two indention inconsistencies in the neighbourhood.
Signed-off-by Uwe Kleine-König <[email protected]>
---
Hello,
this patch was generated using coccinelle, but I aligned the result to the per-file indention.
This is one patch for the whole backlight subsystem. If you want it split per driver for improved patch count numbers, please tell me.
Currently there are no changes to drivers/video/backlight in next, so the change should apply fine. If however there are other changes that result in conflicts, feel free to just drop the hunks in the relevant files and apply anyhow. I'll care about the fallout later.
Best regards
Uwe

Quoted 10 lines

 drivers/video/backlight/adp8860_bl.c | 4 ++--
 drivers/video/backlight/adp8870_bl.c | 4 ++--
 drivers/video/backlight/arcxcnn_bl.c | 2 +-
 drivers/video/backlight/bd6107.c     | 2 +-
 drivers/video/backlight/ktz8866.c    | 2 +-
 drivers/video/backlight/lm3630a_bl.c | 2 +-
 drivers/video/backlight/lm3639_bl.c  | 2 +-
 drivers/video/backlight/lp855x_bl.c  | 2 +-
 drivers/video/backlight/lv5207lp.c   | 2 +-
 9 files changed, 11 insertions(+), 11 deletions(-)

Applied, thanks

Signature · 1 line

Lee Jones [李琼斯]