Skip to content

Commit 29554f2

Browse files
Uwe Kleine-Königlag-linaro
authored andcommitted
backlight: Switch i2c drivers back to use .probe()
After commit b8a1a4c ("i2c: Provide a temporary .probe_new() call-back type"), all drivers being converted to .probe_new() and then 03c835f ("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 <u.kleine-koenig@pengutronix.de> Link: https://lore.kernel.org/r/20230521143844.375244-1-u.kleine-koenig@pengutronix.de Signed-off-by: Lee Jones <lee@kernel.org>
1 parent ae9c480 commit 29554f2

9 files changed

Lines changed: 11 additions & 11 deletions

File tree

drivers/video/backlight/adp8860_bl.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -803,8 +803,8 @@ static struct i2c_driver adp8860_driver = {
803803
.name = KBUILD_MODNAME,
804804
.pm = &adp8860_i2c_pm_ops,
805805
},
806-
.probe_new = adp8860_probe,
807-
.remove = adp8860_remove,
806+
.probe = adp8860_probe,
807+
.remove = adp8860_remove,
808808
.id_table = adp8860_id,
809809
};
810810

drivers/video/backlight/adp8870_bl.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -973,8 +973,8 @@ static struct i2c_driver adp8870_driver = {
973973
.name = KBUILD_MODNAME,
974974
.pm = &adp8870_i2c_pm_ops,
975975
},
976-
.probe_new = adp8870_probe,
977-
.remove = adp8870_remove,
976+
.probe = adp8870_probe,
977+
.remove = adp8870_remove,
978978
.id_table = adp8870_id,
979979
};
980980

drivers/video/backlight/arcxcnn_bl.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -392,7 +392,7 @@ static struct i2c_driver arcxcnn_driver = {
392392
.name = "arcxcnn_bl",
393393
.of_match_table = arcxcnn_dt_ids,
394394
},
395-
.probe_new = arcxcnn_probe,
395+
.probe = arcxcnn_probe,
396396
.remove = arcxcnn_remove,
397397
.id_table = arcxcnn_ids,
398398
};

drivers/video/backlight/bd6107.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ static struct i2c_driver bd6107_driver = {
192192
.driver = {
193193
.name = "bd6107",
194194
},
195-
.probe_new = bd6107_probe,
195+
.probe = bd6107_probe,
196196
.remove = bd6107_remove,
197197
.id_table = bd6107_ids,
198198
};

drivers/video/backlight/ktz8866.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ static struct i2c_driver ktz8866_driver = {
196196
.name = "ktz8866",
197197
.of_match_table = ktz8866_match_table,
198198
},
199-
.probe_new = ktz8866_probe,
199+
.probe = ktz8866_probe,
200200
.remove = ktz8866_remove,
201201
.id_table = ktz8866_ids,
202202
};

drivers/video/backlight/lm3630a_bl.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -620,7 +620,7 @@ static struct i2c_driver lm3630a_i2c_driver = {
620620
.name = LM3630A_NAME,
621621
.of_match_table = lm3630a_match_table,
622622
},
623-
.probe_new = lm3630a_probe,
623+
.probe = lm3630a_probe,
624624
.remove = lm3630a_remove,
625625
.id_table = lm3630a_id,
626626
};

drivers/video/backlight/lm3639_bl.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -411,7 +411,7 @@ static struct i2c_driver lm3639_i2c_driver = {
411411
.driver = {
412412
.name = LM3639_NAME,
413413
},
414-
.probe_new = lm3639_probe,
414+
.probe = lm3639_probe,
415415
.remove = lm3639_remove,
416416
.id_table = lm3639_id,
417417
};

drivers/video/backlight/lp855x_bl.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -587,7 +587,7 @@ static struct i2c_driver lp855x_driver = {
587587
.of_match_table = of_match_ptr(lp855x_dt_ids),
588588
.acpi_match_table = ACPI_PTR(lp855x_acpi_match),
589589
},
590-
.probe_new = lp855x_probe,
590+
.probe = lp855x_probe,
591591
.remove = lp855x_remove,
592592
.id_table = lp855x_ids,
593593
};

drivers/video/backlight/lv5207lp.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ static struct i2c_driver lv5207lp_driver = {
141141
.driver = {
142142
.name = "lv5207lp",
143143
},
144-
.probe_new = lv5207lp_probe,
144+
.probe = lv5207lp_probe,
145145
.remove = lv5207lp_remove,
146146
.id_table = lv5207lp_ids,
147147
};

0 commit comments

Comments
 (0)