clk: 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/20230427125531.622202-1-u.kleine-koenig@pengutronix.de
Signed-off-by: Stephen Boyd <sboyd@kernel.org>

diff --git a/drivers/clk/clk-cdce706.c b/drivers/clk/clk-cdce706.c
index d8bee8180a6b37946f47aea6fdae986779b8a62c..627ca0ed82c1798cf36e405aed6c129d6d64420a 100644 (file)
--- a/drivers/clk/clk-cdce706.c
+++ b/drivers/clk/clk-cdce706.c
@@ -684,7 +684,7 @@ static struct i2c_driver cdce706_i2c_driver = {
                .name   = "cdce706",
                .of_match_table = of_match_ptr(cdce706_dt_match),
        },
-       .probe_new      = cdce706_probe,
+       .probe          = cdce706_probe,
        .id_table       = cdce706_id,
 };
 module_i2c_driver(cdce706_i2c_driver);

diff --git a/drivers/clk/clk-cdce925.c b/drivers/clk/clk-cdce925.c
index 6350682f7e6d23d7035c6cc1a83f30d413678ebc..e0d22c2fd213e680e2d451a08340fa44c86c3894 100644 (file)
--- a/drivers/clk/clk-cdce925.c
+++ b/drivers/clk/clk-cdce925.c
@@ -824,7 +824,7 @@ static struct i2c_driver cdce925_driver = {
                .name = "cdce925",
                .of_match_table = of_match_ptr(clk_cdce925_of_match),
        },
-       .probe_new      = cdce925_probe,
+       .probe          = cdce925_probe,
        .id_table       = cdce925_id,
 };
 module_i2c_driver(cdce925_driver);

diff --git a/drivers/clk/clk-cs2000-cp.c b/drivers/clk/clk-cs2000-cp.c
index 320d39922206ad470071ab9267b7025a3fb3e735..b82fee6a3d6f01b605e470976995a21a60710937 100644 (file)
--- a/drivers/clk/clk-cs2000-cp.c
+++ b/drivers/clk/clk-cs2000-cp.c
@@ -622,7 +622,7 @@ static struct i2c_driver cs2000_driver = {
                .pm     = &cs2000_pm_ops,
                .of_match_table = cs2000_of_match,
        },
-       .probe_new      = cs2000_probe,
+       .probe          = cs2000_probe,
        .remove         = cs2000_remove,
        .id_table       = cs2000_id,
 };

diff --git a/drivers/clk/clk-max9485.c b/drivers/clk/clk-max9485.c
index 5f85b0a32872ae4887d0bffdc32e30fbb76f4659..be9020b6c789642e6d63065aa905088e01929147 100644 (file)
--- a/drivers/clk/clk-max9485.c
+++ b/drivers/clk/clk-max9485.c
@@ -376,7 +376,7 @@ static struct i2c_driver max9485_driver = {
                .pm             = &max9485_pm_ops,
                .of_match_table = max9485_dt_ids,
        },
-       .probe_new = max9485_i2c_probe,
+       .probe = max9485_i2c_probe,
        .id_table = max9485_i2c_ids,
 };
 module_i2c_driver(max9485_driver);

diff --git a/drivers/clk/clk-renesas-pcie.c b/drivers/clk/clk-renesas-pcie.c
index 10d31c222a1cb428c3b4e3077adba7193e759c9f..4159029acf69285d7f084b672ce740a3fb6ad4f0 100644 (file)
--- a/drivers/clk/clk-renesas-pcie.c
+++ b/drivers/clk/clk-renesas-pcie.c
@@ -413,7 +413,7 @@ static struct i2c_driver rs9_driver = {
                .pm     = &rs9_pm_ops,
                .of_match_table = clk_rs9_of_match,
        },
-       .probe_new      = rs9_probe,
+       .probe          = rs9_probe,
        .id_table       = rs9_id,
 };
 module_i2c_driver(rs9_driver);

diff --git a/drivers/clk/clk-si514.c b/drivers/clk/clk-si514.c
index cabdd8e8f4dbd2855418668c56c00a9d4e486d18..e8c18afac18412b46cf381765421e198427e5fe5 100644 (file)
--- a/drivers/clk/clk-si514.c
+++ b/drivers/clk/clk-si514.c
@@ -387,7 +387,7 @@ static struct i2c_driver si514_driver = {
                .name = "si514",
                .of_match_table = clk_si514_of_match,
        },
-       .probe_new      = si514_probe,
+       .probe          = si514_probe,
        .id_table       = si514_id,
 };
 module_i2c_driver(si514_driver);

diff --git a/drivers/clk/clk-si5341.c b/drivers/clk/clk-si5341.c
index 0e528d7ba656ee82a49ed352fdf4bde2086c9a3c..dbd21e658a3e7fd9cf3f4a6ba6184866eaca9b28 100644 (file)
--- a/drivers/clk/clk-si5341.c
+++ b/drivers/clk/clk-si5341.c
@@ -1834,7 +1834,7 @@ static struct i2c_driver si5341_driver = {
                .name = "si5341",
                .of_match_table = clk_si5341_of_match,
        },
-       .probe_new      = si5341_probe,
+       .probe          = si5341_probe,
        .remove         = si5341_remove,
        .id_table       = si5341_id,
 };

diff --git a/drivers/clk/clk-si5351.c b/drivers/clk/clk-si5351.c
index 4fcf7056717e9a98fc7f6fab40222a88429e7f94..7a09847f5b8ebd2697dbd828ac59c57c29dc82a6 100644 (file)
--- a/drivers/clk/clk-si5351.c
+++ b/drivers/clk/clk-si5351.c
@@ -1656,7 +1656,7 @@ static struct i2c_driver si5351_driver = {
                .name = "si5351",
                .of_match_table = of_match_ptr(si5351_dt_ids),
        },
-       .probe_new = si5351_i2c_probe,
+       .probe = si5351_i2c_probe,
        .id_table = si5351_i2c_ids,
 };
 module_i2c_driver(si5351_driver);

diff --git a/drivers/clk/clk-si544.c b/drivers/clk/clk-si544.c
index 089786907641ebd8aa3256c261c9c6af1f199714..22925968aa35537c67c844e36588d7f180bb34d1 100644 (file)
--- a/drivers/clk/clk-si544.c
+++ b/drivers/clk/clk-si544.c
@@ -520,7 +520,7 @@ static struct i2c_driver si544_driver = {
                .name = "si544",
                .of_match_table = clk_si544_of_match,
        },
-       .probe_new      = si544_probe,
+       .probe          = si544_probe,
        .id_table       = si544_id,
 };
 module_i2c_driver(si544_driver);

diff --git a/drivers/clk/clk-si570.c b/drivers/clk/clk-si570.c
index 0b834e9efb4bc2d1473451655c27870ddb782e61..de0212fb5f879a681a02dc3888cc3dda4a7b5adb 100644 (file)
--- a/drivers/clk/clk-si570.c
+++ b/drivers/clk/clk-si570.c
@@ -510,7 +510,7 @@ static struct i2c_driver si570_driver = {
                .name = "si570",
                .of_match_table = clk_si570_of_match,
        },
-       .probe_new      = si570_probe,
+       .probe          = si570_probe,
        .id_table       = si570_id,
 };
 module_i2c_driver(si570_driver);

diff --git a/drivers/clk/clk-versaclock5.c b/drivers/clk/clk-versaclock5.c
index fa71a57875ce8c0ca67c95b56b2576c8d31ea055..b1586f4f16fa9bcc652c6ba23ca94c2f06237258 100644 (file)
--- a/drivers/clk/clk-versaclock5.c
+++ b/drivers/clk/clk-versaclock5.c
@@ -1304,7 +1304,7 @@ static struct i2c_driver vc5_driver = {
                .pm     = &vc5_pm_ops,
                .of_match_table = clk_vc5_of_match,
        },
-       .probe_new      = vc5_probe,
+       .probe          = vc5_probe,
        .remove         = vc5_remove,
        .id_table       = vc5_id,
 };

diff --git a/drivers/clk/clk-versaclock7.c b/drivers/clk/clk-versaclock7.c
index 8e4f86e852aa0963421db2c5a4e028cb9975aefa..056513a46167d4a578fa196128fc39bf291e7356 100644 (file)
--- a/drivers/clk/clk-versaclock7.c
+++ b/drivers/clk/clk-versaclock7.c
@@ -1298,7 +1298,7 @@ static struct i2c_driver vc7_i2c_driver = {
                .name = "vc7",
                .of_match_table = vc7_of_match,
        },
-       .probe_new = vc7_probe,
+       .probe = vc7_probe,
        .remove = vc7_remove,
        .id_table = vc7_i2c_id,
 };