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 <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>

diff --git a/drivers/video/backlight/adp8860_bl.c b/drivers/video/backlight/adp8860_bl.c
index a479aab90f7844a74f3f5a32a600b891da745d04..f51ada4795e8eee3fba11316900b39bdbc4203b2 100644 (file)
--- a/drivers/video/backlight/adp8860_bl.c
+++ b/drivers/video/backlight/adp8860_bl.c
@@ -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,
 };
 

diff --git a/drivers/video/backlight/adp8870_bl.c b/drivers/video/backlight/adp8870_bl.c
index d6b0007db6491d984c754d4658e3f9d2faa99ded..6bb18dc970e974fa2e1cb8ff6f307b7ce42478d6 100644 (file)
--- a/drivers/video/backlight/adp8870_bl.c
+++ b/drivers/video/backlight/adp8870_bl.c
@@ -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,
 };
 

diff --git a/drivers/video/backlight/arcxcnn_bl.c b/drivers/video/backlight/arcxcnn_bl.c
index 088bcca547dd07ed6b76200ce899f194c73e6099..1d5a570cfe022d5bcc0a0b96be165d023d3d60f3 100644 (file)
--- a/drivers/video/backlight/arcxcnn_bl.c
+++ b/drivers/video/backlight/arcxcnn_bl.c
@@ -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,
 };

diff --git a/drivers/video/backlight/bd6107.c b/drivers/video/backlight/bd6107.c
index f4db6c064635b98b8a06f7379918d0ac1ab71bb5..7df25faa07a59f80ebf19557d6b44fbf761896b1 100644 (file)
--- a/drivers/video/backlight/bd6107.c
+++ b/drivers/video/backlight/bd6107.c
@@ -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,
 };

diff --git a/drivers/video/backlight/ktz8866.c b/drivers/video/backlight/ktz8866.c
index d38c13ad39c7ae52814442a716050ed39737cb9f..9c980f2571ee3594cbefda4e7a13950210d8669d 100644 (file)
--- a/drivers/video/backlight/ktz8866.c
+++ b/drivers/video/backlight/ktz8866.c
@@ -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,
 };

diff --git a/drivers/video/backlight/lm3630a_bl.c b/drivers/video/backlight/lm3630a_bl.c
index faf92c8d70c1c830ba319b03eb4ccbd4603fa7b1..8fcb62be597b849b6133044351092c647152e9a4 100644 (file)
--- a/drivers/video/backlight/lm3630a_bl.c
+++ b/drivers/video/backlight/lm3630a_bl.c
@@ -620,7 +620,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,
 };

diff --git a/drivers/video/backlight/lm3639_bl.c b/drivers/video/backlight/lm3639_bl.c
index a836628ce06e8e8166378779e1a6cb1ba5e2d423..5246c171497d6fa4dfb9265b333296cf087adb12 100644 (file)
--- a/drivers/video/backlight/lm3639_bl.c
+++ b/drivers/video/backlight/lm3639_bl.c
@@ -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,
 };

diff --git a/drivers/video/backlight/lp855x_bl.c b/drivers/video/backlight/lp855x_bl.c
index a57c9ef3b1cc5633c4a525234927650e69cbaf97..caac1cfacbe8f89e28bd3fb94332b7fd3f53d288 100644 (file)
--- a/drivers/video/backlight/lp855x_bl.c
+++ b/drivers/video/backlight/lp855x_bl.c
@@ -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,
 };

diff --git a/drivers/video/backlight/lv5207lp.c b/drivers/video/backlight/lv5207lp.c
index 00673c8b66ac5481c1722fefc865d8ff476537e4..56695ce67e4801246050ec330bb40b366c01c9d4 100644 (file)
--- a/drivers/video/backlight/lv5207lp.c
+++ b/drivers/video/backlight/lv5207lp.c
@@ -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,
 };