rtc: Switch i2c drivers back to use .probe()
authorUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Fri, 5 May 2023 12:11:36 +0000 (14:11 +0200)
committerAlexandre Belloni <alexandre.belloni@bootlin.com>
Tue, 6 Jun 2023 21:29:37 +0000 (23:29 +0200)
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/20230505121136.1185653-1-u.kleine-koenig@pengutronix.de
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
35 files changed:
drivers/rtc/rtc-ab-b5ze-s3.c
drivers/rtc/rtc-ab-eoz9.c
drivers/rtc/rtc-abx80x.c
drivers/rtc/rtc-bq32k.c
drivers/rtc/rtc-ds1307.c
drivers/rtc/rtc-ds1374.c
drivers/rtc/rtc-ds1672.c
drivers/rtc/rtc-ds3232.c
drivers/rtc/rtc-em3027.c
drivers/rtc/rtc-fm3130.c
drivers/rtc/rtc-hym8563.c
drivers/rtc/rtc-isl12022.c
drivers/rtc/rtc-isl12026.c
drivers/rtc/rtc-isl1208.c
drivers/rtc/rtc-m41t80.c
drivers/rtc/rtc-max6900.c
drivers/rtc/rtc-nct3018y.c
drivers/rtc/rtc-pcf2127.c
drivers/rtc/rtc-pcf85063.c
drivers/rtc/rtc-pcf8523.c
drivers/rtc/rtc-pcf85363.c
drivers/rtc/rtc-pcf8563.c
drivers/rtc/rtc-pcf8583.c
drivers/rtc/rtc-rs5c372.c
drivers/rtc/rtc-rv3028.c
drivers/rtc/rtc-rv3029c2.c
drivers/rtc/rtc-rv3032.c
drivers/rtc/rtc-rv8803.c
drivers/rtc/rtc-rx6110.c
drivers/rtc/rtc-rx8010.c
drivers/rtc/rtc-rx8025.c
drivers/rtc/rtc-rx8581.c
drivers/rtc/rtc-s35390a.c
drivers/rtc/rtc-sd3078.c
drivers/rtc/rtc-x1205.c

index f2b0971d2c65db64e32253a6feef866c03dc015a..100062001831462a5f6f652414333197042c4fc2 100644 (file)
@@ -944,7 +944,7 @@ static struct i2c_driver abb5zes3_driver = {
                .pm = &abb5zes3_rtc_pm_ops,
                .of_match_table = of_match_ptr(abb5zes3_dt_match),
        },
-       .probe_new = abb5zes3_probe,
+       .probe = abb5zes3_probe,
        .id_table = abb5zes3_id,
 };
 module_i2c_driver(abb5zes3_driver);
index 143650cb7822230436facc99f7c1eb45b5b173ed..04e1b8e93bc1cb6d9fde062a1cfe5f979e19048d 100644 (file)
@@ -584,7 +584,7 @@ static struct i2c_driver abeoz9_driver = {
                .name = "rtc-ab-eoz9",
                .of_match_table = of_match_ptr(abeoz9_dt_match),
        },
-       .probe_new = abeoz9_probe,
+       .probe = abeoz9_probe,
        .id_table = abeoz9_id,
 };
 
index f34a2e59cac765380d50a93f7892690cd72afa41..e08d3181bd2a66211d3de01d64983000da3f540b 100644 (file)
@@ -992,7 +992,7 @@ static struct i2c_driver abx80x_driver = {
                .name   = "rtc-abx80x",
                .of_match_table = of_match_ptr(abx80x_of_match),
        },
-       .probe_new      = abx80x_probe,
+       .probe          = abx80x_probe,
        .id_table       = abx80x_id,
 };
 
index 967ddc6bf76d68697d304c3b511d0f224d8056da..591e42391747bacd4e7ac03fabc737c57fd27295 100644 (file)
@@ -320,7 +320,7 @@ static struct i2c_driver bq32k_driver = {
                .name   = "bq32k",
                .of_match_table = of_match_ptr(bq32k_of_match),
        },
-       .probe_new      = bq32k_probe,
+       .probe          = bq32k_probe,
        .remove         = bq32k_remove,
        .id_table       = bq32k_id,
 };
index e86ba84df6cbedd1f14f02410dedeb15f9aa3c06..cb5acecc11aa4e0700a7e0b537493cac0357c061 100644 (file)
@@ -2011,7 +2011,7 @@ static struct i2c_driver ds1307_driver = {
                .name   = "rtc-ds1307",
                .of_match_table = ds1307_of_match,
        },
-       .probe_new      = ds1307_probe,
+       .probe          = ds1307_probe,
        .id_table       = ds1307_id,
 };
 
index 7f089f0661634624ba4958c82aa0eed92338a712..4a5005cb23f5930139b91c20b7cb5ca904b01dd5 100644 (file)
@@ -572,7 +572,7 @@ static struct i2c_driver ds1374_driver = {
                .of_match_table = of_match_ptr(ds1374_of_match),
                .pm = &ds1374_pm,
        },
-       .probe_new = ds1374_probe,
+       .probe = ds1374_probe,
        .remove = ds1374_remove,
        .id_table = ds1374_id,
 };
index a3bb2cd9c881b2fc4f2f7e771cebe521a3f94739..641799f30baa995278227fe3751f2adc2c106b9a 100644 (file)
@@ -149,7 +149,7 @@ static struct i2c_driver ds1672_driver = {
                   .name = "rtc-ds1672",
                   .of_match_table = of_match_ptr(ds1672_of_match),
        },
-       .probe_new = ds1672_probe,
+       .probe = ds1672_probe,
        .id_table = ds1672_id,
 };
 
index ce46016c9fd88529795ed84dc6ed5c5b2a1d56ef..89d7b085f7219954b1a154ef41245e76251e9336 100644 (file)
@@ -603,7 +603,7 @@ static struct i2c_driver ds3232_driver = {
                .of_match_table = of_match_ptr(ds3232_of_match),
                .pm     = &ds3232_pm_ops,
        },
-       .probe_new = ds3232_i2c_probe,
+       .probe = ds3232_i2c_probe,
        .id_table = ds3232_id,
 };
 
index 53f9f9391a5f15452f07dccad6102dc437b325ab..fc772eae5da5f25a4ea1d0a13f56b787ece594e7 100644 (file)
@@ -147,7 +147,7 @@ static struct i2c_driver em3027_driver = {
                   .name = "rtc-em3027",
                   .of_match_table = of_match_ptr(em3027_of_match),
        },
-       .probe_new = em3027_probe,
+       .probe = em3027_probe,
        .id_table = em3027_id,
 };
 
index f59bb81f23c0421877c4e60facd26f1cfa7da552..400ce4ad0c49905d003cbad94234be6cc0a1dde3 100644 (file)
@@ -517,7 +517,7 @@ static struct i2c_driver fm3130_driver = {
        .driver = {
                .name   = "rtc-fm3130",
        },
-       .probe_new      = fm3130_probe,
+       .probe          = fm3130_probe,
        .id_table       = fm3130_id,
 };
 
index 7d5a298a9a3bc678c671ede56880e8f82c2f8e98..b018535c842b376adce85d2f584a8c85b0286e5c 100644 (file)
@@ -576,7 +576,7 @@ static struct i2c_driver hym8563_driver = {
                .pm     = &hym8563_pm_ops,
                .of_match_table = hym8563_dt_idtable,
        },
-       .probe_new      = hym8563_probe,
+       .probe          = hym8563_probe,
        .id_table       = hym8563_id,
 };
 
index eef66453841fab4708be588061c1ab6c44c214f6..a613257d1574d387e80208e092a65e764a3e84c1 100644 (file)
@@ -262,7 +262,7 @@ static struct i2c_driver isl12022_driver = {
                .name   = "rtc-isl12022",
                .of_match_table = isl12022_dt_match,
        },
-       .probe_new      = isl12022_probe,
+       .probe          = isl12022_probe,
        .id_table       = isl12022_id,
 };
 
index 1bfca39079d40efbe71b60cb7da3cfa2424589d5..5abff5d348acdb6333e3bf1454da6292e2b0466b 100644 (file)
@@ -490,7 +490,7 @@ static struct i2c_driver isl12026_driver = {
                .name   = "rtc-isl12026",
                .of_match_table = isl12026_dt_match,
        },
-       .probe_new      = isl12026_probe_new,
+       .probe          = isl12026_probe_new,
        .remove         = isl12026_remove,
 };
 
index 73cc6aaf9b8b72f84d51a54d42bcf1d0528dbdf2..92a7a1d8d5c3c5e90c12d10f9644379e6b7ed2b7 100644 (file)
@@ -908,7 +908,7 @@ static struct i2c_driver isl1208_driver = {
                .name = "rtc-isl1208",
                .of_match_table = of_match_ptr(isl1208_of_match),
        },
-       .probe_new = isl1208_probe,
+       .probe = isl1208_probe,
        .id_table = isl1208_id,
 };
 
index c1963f7c424d7032bb13fccc9cf158c7f7e6f2d0..3cc5151e098644aaf4abdfa22c66f2eda14a8c53 100644 (file)
@@ -1013,7 +1013,7 @@ static struct i2c_driver m41t80_driver = {
                .of_match_table = of_match_ptr(m41t80_of_match),
                .pm = &m41t80_pm,
        },
-       .probe_new = m41t80_probe,
+       .probe = m41t80_probe,
        .remove = m41t80_remove,
        .id_table = m41t80_id,
 };
index 0a33851cc51f4f60236fec567f84404db4634384..31b910e4d91a89c530dc8abfaab2b5bf11189949 100644 (file)
@@ -224,7 +224,7 @@ static struct i2c_driver max6900_driver = {
        .driver = {
                   .name = "rtc-max6900",
                   },
-       .probe_new = max6900_probe,
+       .probe = max6900_probe,
        .id_table = max6900_id,
 };
 
index 0a3b14c95d9027ce770e5a30c2f467655519215a..a4e3f924837e0cf904a8c098ccdff895ae1e3fed 100644 (file)
@@ -540,7 +540,7 @@ static struct i2c_driver nct3018y_driver = {
                .name   = "rtc-nct3018y",
                .of_match_table = of_match_ptr(nct3018y_of_match),
        },
-       .probe_new      = nct3018y_probe,
+       .probe          = nct3018y_probe,
        .id_table       = nct3018y_id,
 };
 
index 87f4fc9df68b4a66de70c8768611511828780bb4..ee03b04b74baa7c2740e15f672eb90bbb0a8602e 100644 (file)
@@ -923,7 +923,7 @@ static struct i2c_driver pcf2127_i2c_driver = {
                .name   = "rtc-pcf2127-i2c",
                .of_match_table = of_match_ptr(pcf2127_of_match),
        },
-       .probe_new      = pcf2127_i2c_probe,
+       .probe          = pcf2127_i2c_probe,
        .id_table       = pcf2127_i2c_id,
 };
 
index 71a4563559819473ebd7a5cf430edf90f2ef60ee..e517abfaee2a03d64882add2177e736952b42cfa 100644 (file)
@@ -681,7 +681,7 @@ static struct i2c_driver pcf85063_driver = {
                .name   = "rtc-pcf85063",
                .of_match_table = of_match_ptr(pcf85063_of_match),
        },
-       .probe_new      = pcf85063_probe,
+       .probe          = pcf85063_probe,
        .id_table       = pcf85063_ids,
 };
 
index e7115ebef70771e2ae8db1641b72e90320e0bd1f..d1efde3e7a8094e01b4f34b66f2f5990258ca3cb 100644 (file)
@@ -488,7 +488,7 @@ static struct i2c_driver pcf8523_driver = {
                .name = "rtc-pcf8523",
                .of_match_table = pcf8523_of_match,
        },
-       .probe_new = pcf8523_probe,
+       .probe = pcf8523_probe,
        .id_table = pcf8523_id,
 };
 module_i2c_driver(pcf8523_driver);
index 8958eadf1c3efb0e0281cc910df3bd5ed0c934ed..65b8b1338dbb0b607d651df507bf43097d3debee 100644 (file)
@@ -475,7 +475,7 @@ static struct i2c_driver pcf85363_driver = {
                .name   = "pcf85363",
                .of_match_table = of_match_ptr(dev_ids),
        },
-       .probe_new = pcf85363_probe,
+       .probe = pcf85363_probe,
 };
 
 module_i2c_driver(pcf85363_driver);
index 7e720472213c7c76e2971880d92d68550875e127..ea82b89d8929f95fb26e1f3e77794d75a094a429 100644 (file)
@@ -612,7 +612,7 @@ static struct i2c_driver pcf8563_driver = {
                .name   = "rtc-pcf8563",
                .of_match_table = of_match_ptr(pcf8563_of_match),
        },
-       .probe_new      = pcf8563_probe,
+       .probe          = pcf8563_probe,
        .id_table       = pcf8563_id,
 };
 
index 87074d178274e92576fea2dbd94979848672a2dd..a7e0fc360b6a10703d8c4c00073df6a794ac61fb 100644 (file)
@@ -306,7 +306,7 @@ static struct i2c_driver pcf8583_driver = {
        .driver = {
                .name   = "pcf8583",
        },
-       .probe_new      = pcf8583_probe,
+       .probe          = pcf8583_probe,
        .id_table       = pcf8583_id,
 };
 
index b4c5d016eca32c10838c352859ff1b73fbcb4556..a5a6c8772ecd4beeb57498bf998c3460d13d3ba9 100644 (file)
@@ -921,7 +921,7 @@ static struct i2c_driver rs5c372_driver = {
                .name   = "rtc-rs5c372",
                .of_match_table = of_match_ptr(rs5c372_of_match),
        },
-       .probe_new      = rs5c372_probe,
+       .probe          = rs5c372_probe,
        .remove         = rs5c372_remove,
        .id_table       = rs5c372_id,
 };
index ec5d7a614e2dd25ba5b5a5e3e76e558ca3fbcf33..5595a4684f75b2d23bb9d40a97b851686dd9f09e 100644 (file)
@@ -1000,7 +1000,7 @@ static struct i2c_driver rv3028_driver = {
                .acpi_match_table = rv3028_i2c_acpi_match,
                .of_match_table = of_match_ptr(rv3028_of_match),
        },
-       .probe_new      = rv3028_probe,
+       .probe          = rv3028_probe,
 };
 module_i2c_driver(rv3028_driver);
 
index 0852f6709a8591cf374056f932ff99aed9c2e769..4a81feeb00ffde03de8d37a2544541b4fde97850 100644 (file)
@@ -824,7 +824,7 @@ static struct i2c_driver rv3029_driver = {
                .name = "rv3029",
                .of_match_table = of_match_ptr(rv3029_of_match),
        },
-       .probe_new      = rv3029_i2c_probe,
+       .probe          = rv3029_i2c_probe,
        .id_table       = rv3029_id,
 };
 
index 7b36e7f125f7a4bdb29971c49f1481ecee95d865..6b8eb2039a33368b3d203e20e1139953fadb250c 100644 (file)
@@ -998,7 +998,7 @@ static struct i2c_driver rv3032_driver = {
                .acpi_match_table = rv3032_i2c_acpi_match,
                .of_match_table = of_match_ptr(rv3032_of_match),
        },
-       .probe_new      = rv3032_probe,
+       .probe          = rv3032_probe,
 };
 module_i2c_driver(rv3032_driver);
 
index 25c3b9e4f515af3dcf6c68d7f689036203935264..98679cae13e8409ae0d080e2e42fa886c3d8e1a1 100644 (file)
@@ -739,7 +739,7 @@ static struct i2c_driver rv8803_driver = {
                .name = "rtc-rv8803",
                .of_match_table = of_match_ptr(rv8803_of_match),
        },
-       .probe_new      = rv8803_probe,
+       .probe          = rv8803_probe,
        .id_table       = rv8803_id,
 };
 module_i2c_driver(rv8803_driver);
index 37608883a796d5be0349ce6d7675f84f3f5f227a..8702db6096ba4e7cb6c6a5f7a30233bc7395250e 100644 (file)
@@ -462,7 +462,7 @@ static struct i2c_driver rx6110_i2c_driver = {
                .name = RX6110_DRIVER_NAME,
                .acpi_match_table = rx6110_i2c_acpi_match,
        },
-       .probe_new      = rx6110_i2c_probe,
+       .probe          = rx6110_i2c_probe,
        .id_table       = rx6110_i2c_id,
 };
 
index b9c8dad2620853ff0398f477d02bad2a96bc5426..f44e212c07ded4ff1f8813eab9a7dc207b1df342 100644 (file)
@@ -424,7 +424,7 @@ static struct i2c_driver rx8010_driver = {
                .name = "rtc-rx8010",
                .of_match_table = of_match_ptr(rx8010_of_match),
        },
-       .probe_new      = rx8010_probe,
+       .probe          = rx8010_probe,
        .id_table       = rx8010_id,
 };
 
index 331c20d4d843c1a3aa234c0083763b1151b8eb59..aabe62c283a150f18810545a05827f54b8ed468f 100644 (file)
@@ -581,7 +581,7 @@ static struct i2c_driver rx8025_driver = {
        .driver = {
                .name = "rtc-rx8025",
        },
-       .probe_new      = rx8025_probe,
+       .probe          = rx8025_probe,
        .id_table       = rx8025_id,
 };
 
index 14edb7534c97164853dfe970ce79b811341980c8..82881fd2e14a1aa844182ac9cd5d05e481d5f192 100644 (file)
@@ -325,7 +325,7 @@ static struct i2c_driver rx8581_driver = {
                .name   = "rtc-rx8581",
                .of_match_table = of_match_ptr(rx8581_of_match),
        },
-       .probe_new      = rx8581_probe,
+       .probe          = rx8581_probe,
        .id_table       = rx8581_id,
 };
 
index b18daaf72b17dbd87e982362985ea584c454e2c8..90a3028ac57433444ab8d3b091d35c264aceaefa 100644 (file)
@@ -499,7 +499,7 @@ static struct i2c_driver s35390a_driver = {
                .name   = "rtc-s35390a",
                .of_match_table = of_match_ptr(s35390a_of_match),
        },
-       .probe_new      = s35390a_probe,
+       .probe          = s35390a_probe,
        .id_table       = s35390a_id,
 };
 
index e2f90d768ca80dd19f602226aac49e1d10c3ea74..7760394ccd2dfbaac41ac0ccd70180282886bbc2 100644 (file)
@@ -217,7 +217,7 @@ static struct i2c_driver sd3078_driver = {
                .name   = "sd3078",
                .of_match_table = of_match_ptr(rtc_dt_match),
        },
-       .probe_new  = sd3078_probe,
+       .probe      = sd3078_probe,
        .id_table   = sd3078_id,
 };
 
index f587afa843573d2c7fa69a035f5b5886337c4544..807f953ae0aedc2541bdf58fe0e7bf8eaaa54f5b 100644 (file)
@@ -679,7 +679,7 @@ static struct i2c_driver x1205_driver = {
                .name   = "rtc-x1205",
                .of_match_table = x1205_dt_ids,
        },
-       .probe_new      = x1205_probe,
+       .probe          = x1205_probe,
        .remove         = x1205_remove,
        .id_table       = x1205_id,
 };