leds: 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.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Link: https://lore.kernel.org/r/20230517180559.166329-1-u.kleine-koenig@pengutronix.de
Signed-off-by: Lee Jones <lee@kernel.org>

diff --git a/drivers/leds/flash/leds-as3645a.c b/drivers/leds/flash/leds-as3645a.c
index bb2249771acb29612e987903021a39e7a46868e2..7533c51f8ddf894f0dac4ae911a443e551cd3a2c 100644 (file)
--- a/drivers/leds/flash/leds-as3645a.c
+++ b/drivers/leds/flash/leds-as3645a.c
@@ -759,7 +759,7 @@ static struct i2c_driver as3645a_i2c_driver = {
                .of_match_table = as3645a_of_table,
                .name = AS_NAME,
        },
-       .probe_new      = as3645a_probe,
+       .probe = as3645a_probe,
        .remove = as3645a_remove,
        .id_table = as3645a_id_table,
 };

diff --git a/drivers/leds/flash/leds-lm3601x.c b/drivers/leds/flash/leds-lm3601x.c
index 78730e066a733e35b7f63b05ca4582f98f463c1c..b6c524facf498ba944eb3838f324503063cc6f0a 100644 (file)
--- a/drivers/leds/flash/leds-lm3601x.c
+++ b/drivers/leds/flash/leds-lm3601x.c
@@ -471,7 +471,7 @@ static struct i2c_driver lm3601x_i2c_driver = {
                .name = "lm3601x",
                .of_match_table = of_lm3601x_leds_match,
        },
-       .probe_new = lm3601x_probe,
+       .probe = lm3601x_probe,
        .remove = lm3601x_remove,
        .id_table = lm3601x_id,
 };

diff --git a/drivers/leds/flash/leds-rt4505.c b/drivers/leds/flash/leds-rt4505.c
index e404fe8b0314f979d0d74b46144c9add5c5f5828..1ae5b387f4a50de12ceb20c18c25e2dd9741b620 100644 (file)
--- a/drivers/leds/flash/leds-rt4505.c
+++ b/drivers/leds/flash/leds-rt4505.c
@@ -419,7 +419,7 @@ static struct i2c_driver rt4505_driver = {
                .name = "rt4505",
                .of_match_table = of_match_ptr(rt4505_leds_match),
        },
-       .probe_new = rt4505_probe,
+       .probe = rt4505_probe,
        .remove = rt4505_remove,
        .shutdown = rt4505_shutdown,
 };

diff --git a/drivers/leds/leds-an30259a.c b/drivers/leds/leds-an30259a.c
index 89df267853a91e2c2e8c825c7822243f07ba2cdb..24b1041213c27e2563e3ac1c14e41e3b60ce7655 100644 (file)
--- a/drivers/leds/leds-an30259a.c
+++ b/drivers/leds/leds-an30259a.c
@@ -346,7 +346,7 @@ static struct i2c_driver an30259a_driver = {
                .name = "leds-an30259a",
                .of_match_table = of_match_ptr(an30259a_match_table),
        },
-       .probe_new = an30259a_probe,
+       .probe = an30259a_probe,
        .remove = an30259a_remove,
        .id_table = an30259a_id,
 };

diff --git a/drivers/leds/leds-aw2013.c b/drivers/leds/leds-aw2013.c
index 0b52fc9097c6e1abcb3459ffb7405bd83c419c3c..59765640b70fe9c68aafd94feaafd5edd19aacb4 100644 (file)
--- a/drivers/leds/leds-aw2013.c
+++ b/drivers/leds/leds-aw2013.c
@@ -422,7 +422,7 @@ static struct i2c_driver aw2013_driver = {
                .name = "leds-aw2013",
                .of_match_table = of_match_ptr(aw2013_match_table),
        },
-       .probe_new = aw2013_probe,
+       .probe = aw2013_probe,
        .remove = aw2013_remove,
 };
 

diff --git a/drivers/leds/leds-bd2606mvv.c b/drivers/leds/leds-bd2606mvv.c
index 76f9d4d70f9a66a058926e2261e89a82ca2c14c5..3fda712d2f80955fb8fe1a6d03c864634e683f87 100644 (file)
--- a/drivers/leds/leds-bd2606mvv.c
+++ b/drivers/leds/leds-bd2606mvv.c
@@ -150,7 +150,7 @@ static struct i2c_driver bd2606mvv_driver = {
                .name    = "leds-bd2606mvv",
                .of_match_table = of_match_ptr(of_bd2606mvv_leds_match),
        },
-       .probe_new = bd2606mvv_probe,
+       .probe = bd2606mvv_probe,
 };
 
 module_i2c_driver(bd2606mvv_driver);

diff --git a/drivers/leds/leds-bd2802.c b/drivers/leds/leds-bd2802.c
index 601185ddabcc28e361b47fd26bcc9b3729f84091..0792ea126cea0d299e7b3401fe20fc2e6a4e750d 100644 (file)
--- a/drivers/leds/leds-bd2802.c
+++ b/drivers/leds/leds-bd2802.c
@@ -786,7 +786,7 @@ static struct i2c_driver bd2802_i2c_driver = {
                .name   = "BD2802",
                .pm     = &bd2802_pm,
        },
-       .probe_new      = bd2802_probe,
+       .probe          = bd2802_probe,
        .remove         = bd2802_remove,
        .id_table       = bd2802_id,
 };

diff --git a/drivers/leds/leds-blinkm.c b/drivers/leds/leds-blinkm.c
index 37f2f32ae42d77b9c0cf75943a06dcbbc75cc5c5..ae9fbd32c53daa768b7dcb5d110592e9f84d6f5b 100644 (file)
--- a/drivers/leds/leds-blinkm.c
+++ b/drivers/leds/leds-blinkm.c
@@ -730,7 +730,7 @@ static struct i2c_driver blinkm_driver = {
        .driver = {
                   .name = "blinkm",
                   },
-       .probe_new = blinkm_probe,
+       .probe = blinkm_probe,
        .remove = blinkm_remove,
        .id_table = blinkm_id,
        .detect = blinkm_detect,

diff --git a/drivers/leds/leds-is31fl319x.c b/drivers/leds/leds-is31fl319x.c
index 7c908414ac7e0c468a0cb401a7629e5e9948f0a7..66c65741202e902dd2835db97af20b07ba01de72 100644 (file)
--- a/drivers/leds/leds-is31fl319x.c
+++ b/drivers/leds/leds-is31fl319x.c
@@ -602,7 +602,7 @@ static struct i2c_driver is31fl319x_driver = {
                .name           = "leds-is31fl319x",
                .of_match_table = of_is31fl319x_match,
        },
-       .probe_new = is31fl319x_probe,
+       .probe = is31fl319x_probe,
        .id_table = is31fl319x_id,
 };
 

diff --git a/drivers/leds/leds-is31fl32xx.c b/drivers/leds/leds-is31fl32xx.c
index 799191859ce07add2db903cf821bd83d97efbed1..72cb56d305c433d0540a6ae8212760ed572ddc98 100644 (file)
--- a/drivers/leds/leds-is31fl32xx.c
+++ b/drivers/leds/leds-is31fl32xx.c
@@ -488,7 +488,7 @@ static struct i2c_driver is31fl32xx_driver = {
                .name   = "is31fl32xx",
                .of_match_table = of_is31fl32xx_match,
        },
-       .probe_new      = is31fl32xx_probe,
+       .probe          = is31fl32xx_probe,
        .remove         = is31fl32xx_remove,
        .id_table       = is31fl32xx_id,
 };

diff --git a/drivers/leds/leds-lm3530.c b/drivers/leds/leds-lm3530.c
index a9a2018592ffcc5f39b21196d9c22596e14d6e1a..a2feef8e4ac5ff86364c00dde96b11dc1cf2e85f 100644 (file)
--- a/drivers/leds/leds-lm3530.c
+++ b/drivers/leds/leds-lm3530.c
@@ -484,7 +484,7 @@ static const struct i2c_device_id lm3530_id[] = {
 MODULE_DEVICE_TABLE(i2c, lm3530_id);
 
 static struct i2c_driver lm3530_i2c_driver = {
-       .probe_new = lm3530_probe,
+       .probe = lm3530_probe,
        .remove = lm3530_remove,
        .id_table = lm3530_id,
        .driver = {

diff --git a/drivers/leds/leds-lm3532.c b/drivers/leds/leds-lm3532.c
index a08c09129a68b3c77e5b6b7a67c17b6c7c15c56a..13662a4aa1f2658200fbdeeaa2d8b6118f701a7b 100644 (file)
--- a/drivers/leds/leds-lm3532.c
+++ b/drivers/leds/leds-lm3532.c
@@ -726,7 +726,7 @@ static const struct i2c_device_id lm3532_id[] = {
 MODULE_DEVICE_TABLE(i2c, lm3532_id);
 
 static struct i2c_driver lm3532_i2c_driver = {
-       .probe_new = lm3532_probe,
+       .probe = lm3532_probe,
        .remove = lm3532_remove,
        .id_table = lm3532_id,
        .driver = {

diff --git a/drivers/leds/leds-lm355x.c b/drivers/leds/leds-lm355x.c
index 612873070ca48e3202715dae59db4d76f67f2403..f68771b9eac6bb30eaa2db471e11c5daa599ded2 100644 (file)
--- a/drivers/leds/leds-lm355x.c
+++ b/drivers/leds/leds-lm355x.c
@@ -516,7 +516,7 @@ static struct i2c_driver lm355x_i2c_driver = {
                   .name = LM355x_NAME,
                   .pm = NULL,
                   },
-       .probe_new = lm355x_probe,
+       .probe = lm355x_probe,
        .remove = lm355x_remove,
        .id_table = lm355x_id,
 };

diff --git a/drivers/leds/leds-lm3642.c b/drivers/leds/leds-lm3642.c
index b75ee3546c2ec7fa1e5304a95ba501497153caaa..6eee52e211be738897ed8218b1323903f97a1816 100644 (file)
--- a/drivers/leds/leds-lm3642.c
+++ b/drivers/leds/leds-lm3642.c
@@ -401,7 +401,7 @@ static struct i2c_driver lm3642_i2c_driver = {
                   .name = LM3642_NAME,
                   .pm = NULL,
                   },
-       .probe_new = lm3642_probe,
+       .probe = lm3642_probe,
        .remove = lm3642_remove,
        .id_table = lm3642_id,
 };

diff --git a/drivers/leds/leds-lm3692x.c b/drivers/leds/leds-lm3692x.c
index 66126d0666f5bfd3b5833cf9ab0f7aab7aa8695c..f8ad61e47a19299b9d456db8583676b5ea03307c 100644 (file)
--- a/drivers/leds/leds-lm3692x.c
+++ b/drivers/leds/leds-lm3692x.c
@@ -518,7 +518,7 @@ static struct i2c_driver lm3692x_driver = {
                .name   = "lm3692x",
                .of_match_table = of_lm3692x_leds_match,
        },
-       .probe_new      = lm3692x_probe,
+       .probe          = lm3692x_probe,
        .remove         = lm3692x_remove,
        .id_table       = lm3692x_id,
 };

diff --git a/drivers/leds/leds-lm3697.c b/drivers/leds/leds-lm3697.c
index 10e904bf40a046e69e6a1f7221d15280b40fc733..cfb8ac220db6da36971d6c4ac9e25427d67b3178 100644 (file)
--- a/drivers/leds/leds-lm3697.c
+++ b/drivers/leds/leds-lm3697.c
@@ -376,7 +376,7 @@ static struct i2c_driver lm3697_driver = {
                .name   = "lm3697",
                .of_match_table = of_lm3697_leds_match,
        },
-       .probe_new      = lm3697_probe,
+       .probe          = lm3697_probe,
        .remove         = lm3697_remove,
        .id_table       = lm3697_id,
 };

diff --git a/drivers/leds/leds-lp3944.c b/drivers/leds/leds-lp3944.c
index be47c66b2e00bd6a44d2889bc1193428521fb88b..8ea746c499d196a9c0a22e2fbbc8c8e831fc82e3 100644 (file)
--- a/drivers/leds/leds-lp3944.c
+++ b/drivers/leds/leds-lp3944.c
@@ -427,7 +427,7 @@ static struct i2c_driver lp3944_driver = {
        .driver   = {
                   .name = "lp3944",
        },
-       .probe_new = lp3944_probe,
+       .probe    = lp3944_probe,
        .remove   = lp3944_remove,
        .id_table = lp3944_id,
 };

diff --git a/drivers/leds/leds-lp3952.c b/drivers/leds/leds-lp3952.c
index 24b2e0f9080d95b794c4d78547651a4df7d0c9d7..3bd55652a706ce1b14572c18c4c8fc92be0de9e1 100644 (file)
--- a/drivers/leds/leds-lp3952.c
+++ b/drivers/leds/leds-lp3952.c
@@ -273,7 +273,7 @@ static struct i2c_driver lp3952_i2c_driver = {
        .driver = {
                        .name = LP3952_NAME,
        },
-       .probe_new = lp3952_probe,
+       .probe = lp3952_probe,
        .remove = lp3952_remove,
        .id_table = lp3952_id,
 };

diff --git a/drivers/leds/leds-lp50xx.c b/drivers/leds/leds-lp50xx.c
index 28d6b39fa72dbcb04857d63d51c36e4ef53d5c03..68c4d9967d6831c5bf1a64c7836f328c62c0b1c8 100644 (file)
--- a/drivers/leds/leds-lp50xx.c
+++ b/drivers/leds/leds-lp50xx.c
@@ -608,7 +608,7 @@ static struct i2c_driver lp50xx_driver = {
                .name   = "lp50xx",
                .of_match_table = of_lp50xx_leds_match,
        },
-       .probe_new      = lp50xx_probe,
+       .probe          = lp50xx_probe,
        .remove         = lp50xx_remove,
        .id_table       = lp50xx_id,
 };

diff --git a/drivers/leds/leds-lp5521.c b/drivers/leds/leds-lp5521.c
index acd37d0f0e26484bde215f1bc601971144edab21..030c040fdf6d69e899ef7bca995b058275c57fb5 100644 (file)
--- a/drivers/leds/leds-lp5521.c
+++ b/drivers/leds/leds-lp5521.c
@@ -607,7 +607,7 @@ static struct i2c_driver lp5521_driver = {
                .name   = "lp5521",
                .of_match_table = of_match_ptr(of_lp5521_leds_match),
        },
-       .probe_new      = lp5521_probe,
+       .probe          = lp5521_probe,
        .remove         = lp5521_remove,
        .id_table       = lp5521_id,
 };

diff --git a/drivers/leds/leds-lp5523.c b/drivers/leds/leds-lp5523.c
index a8df22938bdb6778798a7bb07bbac14277c9271a..daa6a165fba6be5231258c38c2f2ab85c55a7eff 100644 (file)
--- a/drivers/leds/leds-lp5523.c
+++ b/drivers/leds/leds-lp5523.c
@@ -987,7 +987,7 @@ static struct i2c_driver lp5523_driver = {
                .name   = "lp5523x",
                .of_match_table = of_match_ptr(of_lp5523_leds_match),
        },
-       .probe_new      = lp5523_probe,
+       .probe          = lp5523_probe,
        .remove         = lp5523_remove,
        .id_table       = lp5523_id,
 };

diff --git a/drivers/leds/leds-lp5562.c b/drivers/leds/leds-lp5562.c
index b5d877faf6d731589fe685c8ec3f60d4d8ee9311..4565cc12cea80031da2bf5a9a3da25384f5c76bc 100644 (file)
--- a/drivers/leds/leds-lp5562.c
+++ b/drivers/leds/leds-lp5562.c
@@ -603,7 +603,7 @@ static struct i2c_driver lp5562_driver = {
                .name   = "lp5562",
                .of_match_table = of_match_ptr(of_lp5562_leds_match),
        },
-       .probe_new      = lp5562_probe,
+       .probe          = lp5562_probe,
        .remove         = lp5562_remove,
        .id_table       = lp5562_id,
 };

diff --git a/drivers/leds/leds-lp8501.c b/drivers/leds/leds-lp8501.c
index 878d81dace8a49e66e5ad4b9ba4c84047866bfa7..f11886aa8965dfa3c8b0ee250ae273604fff4f6a 100644 (file)
--- a/drivers/leds/leds-lp8501.c
+++ b/drivers/leds/leds-lp8501.c
@@ -394,7 +394,7 @@ static struct i2c_driver lp8501_driver = {
                .name   = "lp8501",
                .of_match_table = of_match_ptr(of_lp8501_leds_match),
        },
-       .probe_new      = lp8501_probe,
+       .probe          = lp8501_probe,
        .remove         = lp8501_remove,
        .id_table       = lp8501_id,
 };

diff --git a/drivers/leds/leds-lp8860.c b/drivers/leds/leds-lp8860.c
index 221b386443bce9eed8bd9f1e5e9d049f5493bb09..19b621012e582fce00c983e3e2b4b2e20f09f14c 100644 (file)
--- a/drivers/leds/leds-lp8860.c
+++ b/drivers/leds/leds-lp8860.c
@@ -475,7 +475,7 @@ static struct i2c_driver lp8860_driver = {
                .name   = "lp8860",
                .of_match_table = of_lp8860_leds_match,
        },
-       .probe_new      = lp8860_probe,
+       .probe          = lp8860_probe,
        .remove         = lp8860_remove,
        .id_table       = lp8860_id,
 };

diff --git a/drivers/leds/leds-pca9532.c b/drivers/leds/leds-pca9532.c
index 15b1acfa442e7e4f8bb5b362f3f0e3f7ed6c7b13..8b5c62083e50827ced35ab5e54284ded8e09b29e 100644 (file)
--- a/drivers/leds/leds-pca9532.c
+++ b/drivers/leds/leds-pca9532.c
@@ -102,7 +102,7 @@ static struct i2c_driver pca9532_driver = {
                .name = "leds-pca953x",
                .of_match_table = of_match_ptr(of_pca9532_leds_match),
        },
-       .probe_new = pca9532_probe,
+       .probe = pca9532_probe,
        .remove = pca9532_remove,
        .id_table = pca9532_id,
 };

diff --git a/drivers/leds/leds-pca955x.c b/drivers/leds/leds-pca955x.c
index 1edd092e7894792518aeea3de6b484e95eff935a..b10e1ef38db0b558e26fc143fb9318a9cb14a039 100644 (file)
--- a/drivers/leds/leds-pca955x.c
+++ b/drivers/leds/leds-pca955x.c
@@ -668,7 +668,7 @@ static struct i2c_driver pca955x_driver = {
                .name   = "leds-pca955x",
                .of_match_table = of_pca955x_match,
        },
-       .probe_new = pca955x_probe,
+       .probe = pca955x_probe,
        .id_table = pca955x_id,
 };
 

diff --git a/drivers/leds/leds-pca963x.c b/drivers/leds/leds-pca963x.c
index 9cd476db601f2b7c0c93857528a5d335827fb659..47223c850e4b4dc3bd0155352a3854c0a6e83d7c 100644 (file)
--- a/drivers/leds/leds-pca963x.c
+++ b/drivers/leds/leds-pca963x.c
@@ -431,7 +431,7 @@ static struct i2c_driver pca963x_driver = {
                .name   = "leds-pca963x",
                .of_match_table = of_pca963x_match,
        },
-       .probe_new = pca963x_probe,
+       .probe = pca963x_probe,
        .id_table = pca963x_id,
 };
 

diff --git a/drivers/leds/leds-tca6507.c b/drivers/leds/leds-tca6507.c
index 634cabd5bb79658bae33abe57b29289dbcf0cfb9..aab8617712101b28a406008f3d8e7ee66691d715 100644 (file)
--- a/drivers/leds/leds-tca6507.c
+++ b/drivers/leds/leds-tca6507.c
@@ -808,7 +808,7 @@ static struct i2c_driver tca6507_driver = {
                .name    = "leds-tca6507",
                .of_match_table = of_match_ptr(of_tca6507_leds_match),
        },
-       .probe_new = tca6507_probe,
+       .probe    = tca6507_probe,
        .remove   = tca6507_remove,
        .id_table = tca6507_id,
 };

diff --git a/drivers/leds/leds-tlc591xx.c b/drivers/leds/leds-tlc591xx.c
index 7e31db50036f05bdd928b0793dac5d1d7f80c4dc..dfc6fb2b3e5224cc8d39154c9561f0133cf731b1 100644 (file)
--- a/drivers/leds/leds-tlc591xx.c
+++ b/drivers/leds/leds-tlc591xx.c
@@ -230,7 +230,7 @@ static struct i2c_driver tlc591xx_driver = {
                .name = "tlc591xx",
                .of_match_table = of_match_ptr(of_tlc591xx_leds_match),
        },
-       .probe_new = tlc591xx_probe,
+       .probe = tlc591xx_probe,
        .id_table = tlc591xx_id,
 };
 

diff --git a/drivers/leds/leds-turris-omnia.c b/drivers/leds/leds-turris-omnia.c
index 013f551b32b27c83cf0822b775c0fd4bca22dc94..64b2d7b6d3f315cfdd75dc5be5ee3855ff2b306a 100644 (file)
--- a/drivers/leds/leds-turris-omnia.c
+++ b/drivers/leds/leds-turris-omnia.c
@@ -271,7 +271,7 @@ static const struct i2c_device_id omnia_id[] = {
 MODULE_DEVICE_TABLE(i2c, omnia_id);
 
 static struct i2c_driver omnia_leds_driver = {
-       .probe_new      = omnia_leds_probe,
+       .probe          = omnia_leds_probe,
        .remove         = omnia_leds_remove,
        .id_table       = omnia_id,
        .driver         = {