power: supply: 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>
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>

diff --git a/drivers/power/supply/adp5061.c b/drivers/power/supply/adp5061.c
index 840db62..3e3a0d1 100644 (file)
--- a/drivers/power/supply/adp5061.c
+++ b/drivers/power/supply/adp5061.c
@@ -736,7 +736,7 @@ static struct i2c_driver adp5061_driver = {
        .driver = {
                .name = KBUILD_MODNAME,
        },
-       .probe_new = adp5061_probe,
+       .probe = adp5061_probe,
        .id_table = adp5061_id,
 };
 module_i2c_driver(adp5061_driver);

diff --git a/drivers/power/supply/bd99954-charger.c b/drivers/power/supply/bd99954-charger.c
index 250362e..086dcf4 100644 (file)
--- a/drivers/power/supply/bd99954-charger.c
+++ b/drivers/power/supply/bd99954-charger.c
@@ -1077,7 +1077,7 @@ static struct i2c_driver bd9995x_driver = {
                .name = "bd9995x-charger",
                .of_match_table = bd9995x_of_match,
        },
-       .probe_new = bd9995x_probe,
+       .probe = bd9995x_probe,
 };
 module_i2c_driver(bd9995x_driver);
 

diff --git a/drivers/power/supply/bq2415x_charger.c b/drivers/power/supply/bq2415x_charger.c
index 349b69d..6a4798a 100644 (file)
--- a/drivers/power/supply/bq2415x_charger.c
+++ b/drivers/power/supply/bq2415x_charger.c
@@ -1780,7 +1780,7 @@ static struct i2c_driver bq2415x_driver = {
                .of_match_table = of_match_ptr(bq2415x_of_match_table),
                .acpi_match_table = ACPI_PTR(bq2415x_i2c_acpi_match),
        },
-       .probe_new = bq2415x_probe,
+       .probe = bq2415x_probe,
        .remove = bq2415x_remove,
        .id_table = bq2415x_i2c_id_table,
 };

diff --git a/drivers/power/supply/bq24190_charger.c b/drivers/power/supply/bq24190_charger.c
index de67b98..baa4c93 100644 (file)
--- a/drivers/power/supply/bq24190_charger.c
+++ b/drivers/power/supply/bq24190_charger.c
@@ -2033,7 +2033,7 @@ static const struct of_device_id bq24190_of_match[] = {
 MODULE_DEVICE_TABLE(of, bq24190_of_match);
 
 static struct i2c_driver bq24190_driver = {
-       .probe_new      = bq24190_probe,
+       .probe          = bq24190_probe,
        .remove         = bq24190_remove,
        .shutdown       = bq24190_shutdown,
        .id_table       = bq24190_i2c_ids,

diff --git a/drivers/power/supply/bq24257_charger.c b/drivers/power/supply/bq24257_charger.c
index 45e4ba3..2852860 100644 (file)
--- a/drivers/power/supply/bq24257_charger.c
+++ b/drivers/power/supply/bq24257_charger.c
@@ -1165,7 +1165,7 @@ static struct i2c_driver bq24257_driver = {
                .acpi_match_table = ACPI_PTR(bq24257_acpi_match),
                .pm = &bq24257_pm,
        },
-       .probe_new = bq24257_probe,
+       .probe = bq24257_probe,
        .remove = bq24257_remove,
        .id_table = bq24257_i2c_ids,
 };

diff --git a/drivers/power/supply/bq24735-charger.c b/drivers/power/supply/bq24735-charger.c
index cfca3a8..8efceea 100644 (file)
--- a/drivers/power/supply/bq24735-charger.c
+++ b/drivers/power/supply/bq24735-charger.c
@@ -505,7 +505,7 @@ static struct i2c_driver bq24735_charger_driver = {
                .name = "bq24735-charger",
                .of_match_table = bq24735_match_ids,
        },
-       .probe_new = bq24735_charger_probe,
+       .probe = bq24735_charger_probe,
        .id_table = bq24735_charger_id,
 };
 

diff --git a/drivers/power/supply/bq2515x_charger.c b/drivers/power/supply/bq2515x_charger.c
index da224ae..1dbacc9 100644 (file)
--- a/drivers/power/supply/bq2515x_charger.c
+++ b/drivers/power/supply/bq2515x_charger.c
@@ -1158,7 +1158,7 @@ static struct i2c_driver bq2515x_driver = {
                .name = "bq2515x-charger",
                .of_match_table = bq2515x_of_match,
        },
-       .probe_new = bq2515x_probe,
+       .probe = bq2515x_probe,
        .id_table = bq2515x_i2c_ids,
 };
 module_i2c_driver(bq2515x_driver);

diff --git a/drivers/power/supply/bq256xx_charger.c b/drivers/power/supply/bq256xx_charger.c
index 5ef93d0..82d3cd5 100644 (file)
--- a/drivers/power/supply/bq256xx_charger.c
+++ b/drivers/power/supply/bq256xx_charger.c
@@ -1812,7 +1812,7 @@ static struct i2c_driver bq256xx_driver = {
                .of_match_table = bq256xx_of_match,
                .acpi_match_table = bq256xx_acpi_match,
        },
-       .probe_new = bq256xx_probe,
+       .probe = bq256xx_probe,
        .id_table = bq256xx_i2c_ids,
 };
 module_i2c_driver(bq256xx_driver);

diff --git a/drivers/power/supply/bq25890_charger.c b/drivers/power/supply/bq25890_charger.c
index 22cde35..b82e702 100644 (file)
--- a/drivers/power/supply/bq25890_charger.c
+++ b/drivers/power/supply/bq25890_charger.c
@@ -1646,7 +1646,7 @@ static struct i2c_driver bq25890_driver = {
                .acpi_match_table = ACPI_PTR(bq25890_acpi_match),
                .pm = &bq25890_pm,
        },
-       .probe_new = bq25890_probe,
+       .probe = bq25890_probe,
        .remove = bq25890_remove,
        .shutdown = bq25890_shutdown,
        .id_table = bq25890_i2c_ids,

diff --git a/drivers/power/supply/bq25980_charger.c b/drivers/power/supply/bq25980_charger.c
index a59d976..d841172 100644 (file)
--- a/drivers/power/supply/bq25980_charger.c
+++ b/drivers/power/supply/bq25980_charger.c
@@ -1287,7 +1287,7 @@ static struct i2c_driver bq25980_driver = {
                .name = "bq25980-charger",
                .of_match_table = bq25980_of_match,
        },
-       .probe_new = bq25980_probe,
+       .probe = bq25980_probe,
        .id_table = bq25980_i2c_ids,
 };
 module_i2c_driver(bq25980_driver);

diff --git a/drivers/power/supply/bq27xxx_battery_i2c.c b/drivers/power/supply/bq27xxx_battery_i2c.c
index f876899..0864315 100644 (file)
--- a/drivers/power/supply/bq27xxx_battery_i2c.c
+++ b/drivers/power/supply/bq27xxx_battery_i2c.c
@@ -295,7 +295,7 @@ static struct i2c_driver bq27xxx_battery_i2c_driver = {
                .name = "bq27xxx-battery",
                .of_match_table = of_match_ptr(bq27xxx_battery_i2c_of_match_table),
        },
-       .probe_new = bq27xxx_battery_i2c_probe,
+       .probe = bq27xxx_battery_i2c_probe,
        .remove = bq27xxx_battery_i2c_remove,
        .id_table = bq27xxx_i2c_id_table,
 };

diff --git a/drivers/power/supply/cw2015_battery.c b/drivers/power/supply/cw2015_battery.c
index 473522b..bb29e9e 100644 (file)
--- a/drivers/power/supply/cw2015_battery.c
+++ b/drivers/power/supply/cw2015_battery.c
@@ -747,7 +747,7 @@ static struct i2c_driver cw_bat_driver = {
                .of_match_table = cw2015_of_match,
                .pm = &cw_bat_pm_ops,
        },
-       .probe_new = cw_bat_probe,
+       .probe = cw_bat_probe,
        .id_table = cw_bat_id_table,
 };
 

diff --git a/drivers/power/supply/ds2782_battery.c b/drivers/power/supply/ds2782_battery.c
index 9b96192..85aa9c4 100644 (file)
--- a/drivers/power/supply/ds2782_battery.c
+++ b/drivers/power/supply/ds2782_battery.c
@@ -458,7 +458,7 @@ static struct i2c_driver ds278x_battery_driver = {
                .name   = "ds2782-battery",
                .pm     = &ds278x_battery_pm_ops,
        },
-       .probe_new      = ds278x_battery_probe,
+       .probe          = ds278x_battery_probe,
        .remove         = ds278x_battery_remove,
        .id_table       = ds278x_id,
 };

diff --git a/drivers/power/supply/ip5xxx_power.c b/drivers/power/supply/ip5xxx_power.c
index 00221e9..8226364 100644 (file)
--- a/drivers/power/supply/ip5xxx_power.c
+++ b/drivers/power/supply/ip5xxx_power.c
@@ -625,7 +625,7 @@ static const struct of_device_id ip5xxx_power_of_match[] = {
 MODULE_DEVICE_TABLE(of, ip5xxx_power_of_match);
 
 static struct i2c_driver ip5xxx_power_driver = {
-       .probe_new      = ip5xxx_power_probe,
+       .probe          = ip5xxx_power_probe,
        .driver         = {
                .name           = "ip5xxx-power",
                .of_match_table = ip5xxx_power_of_match,

diff --git a/drivers/power/supply/lp8727_charger.c b/drivers/power/supply/lp8727_charger.c
index dc42d35..0875391 100644 (file)
--- a/drivers/power/supply/lp8727_charger.c
+++ b/drivers/power/supply/lp8727_charger.c
@@ -615,7 +615,7 @@ static struct i2c_driver lp8727_driver = {
                   .name = "lp8727",
                   .of_match_table = of_match_ptr(lp8727_dt_ids),
                   },
-       .probe_new = lp8727_probe,
+       .probe = lp8727_probe,
        .remove = lp8727_remove,
        .id_table = lp8727_ids,
 };

diff --git a/drivers/power/supply/ltc2941-battery-gauge.c b/drivers/power/supply/ltc2941-battery-gauge.c
index d3fb428..cad39a8 100644 (file)
--- a/drivers/power/supply/ltc2941-battery-gauge.c
+++ b/drivers/power/supply/ltc2941-battery-gauge.c
@@ -635,7 +635,7 @@ static struct i2c_driver ltc294x_driver = {
                .of_match_table = ltc294x_i2c_of_match,
                .pm     = LTC294X_PM_OPS,
        },
-       .probe_new      = ltc294x_i2c_probe,
+       .probe          = ltc294x_i2c_probe,
        .shutdown       = ltc294x_i2c_shutdown,
        .id_table       = ltc294x_i2c_id,
 };

diff --git a/drivers/power/supply/ltc4162-l-charger.c b/drivers/power/supply/ltc4162-l-charger.c
index 2855808..ec5b4a2 100644 (file)
--- a/drivers/power/supply/ltc4162-l-charger.c
+++ b/drivers/power/supply/ltc4162-l-charger.c
@@ -915,7 +915,7 @@ static const struct of_device_id ltc4162l_of_match[] __maybe_unused = {
 MODULE_DEVICE_TABLE(of, ltc4162l_of_match);
 
 static struct i2c_driver ltc4162l_driver = {
-       .probe_new      = ltc4162l_probe,
+       .probe          = ltc4162l_probe,
        .alert          = ltc4162l_alert,
        .id_table       = ltc4162l_i2c_id_table,
        .driver = {

diff --git a/drivers/power/supply/max14656_charger_detector.c b/drivers/power/supply/max14656_charger_detector.c
index 0d0180f..fbdf12c 100644 (file)
--- a/drivers/power/supply/max14656_charger_detector.c
+++ b/drivers/power/supply/max14656_charger_detector.c
@@ -316,7 +316,7 @@ static struct i2c_driver max14656_i2c_driver = {
                .name   = "max14656",
                .of_match_table = max14656_match_table,
        },
-       .probe_new      = max14656_probe,
+       .probe          = max14656_probe,
        .id_table       = max14656_id,
 };
 module_i2c_driver(max14656_i2c_driver);

diff --git a/drivers/power/supply/max17040_battery.c b/drivers/power/supply/max17040_battery.c
index d107595..22ea7de 100644 (file)
--- a/drivers/power/supply/max17040_battery.c
+++ b/drivers/power/supply/max17040_battery.c
@@ -599,7 +599,7 @@ static struct i2c_driver max17040_i2c_driver = {
                .of_match_table = max17040_of_match,
                .pm     = MAX17040_PM_OPS,
        },
-       .probe_new      = max17040_probe,
+       .probe          = max17040_probe,
        .id_table       = max17040_id,
 };
 module_i2c_driver(max17040_i2c_driver);

diff --git a/drivers/power/supply/max17042_battery.c b/drivers/power/supply/max17042_battery.c
index 6a2d00d..17ac2ab 100644 (file)
--- a/drivers/power/supply/max17042_battery.c
+++ b/drivers/power/supply/max17042_battery.c
@@ -1215,7 +1215,7 @@ static struct i2c_driver max17042_i2c_driver = {
                .of_match_table = of_match_ptr(max17042_dt_match),
                .pm     = &max17042_pm_ops,
        },
-       .probe_new      = max17042_probe,
+       .probe          = max17042_probe,
        .id_table       = max17042_id,
 };
 module_i2c_driver(max17042_i2c_driver);

diff --git a/drivers/power/supply/max77976_charger.c b/drivers/power/supply/max77976_charger.c
index 4fed745..99659dc 100644 (file)
--- a/drivers/power/supply/max77976_charger.c
+++ b/drivers/power/supply/max77976_charger.c
@@ -499,7 +499,7 @@ static struct i2c_driver max77976_driver = {
                .name           = MAX77976_DRIVER_NAME,
                .of_match_table = max77976_of_id,
        },
-       .probe_new      = max77976_probe,
+       .probe          = max77976_probe,
        .id_table       = max77976_i2c_id,
 };
 module_i2c_driver(max77976_driver);

diff --git a/drivers/power/supply/rt5033_battery.c b/drivers/power/supply/rt5033_battery.c
index 5c04cf3..465c1a9 100644 (file)
--- a/drivers/power/supply/rt5033_battery.c
+++ b/drivers/power/supply/rt5033_battery.c
@@ -172,7 +172,7 @@ static struct i2c_driver rt5033_battery_driver = {
                .name = "rt5033-battery",
                .of_match_table = rt5033_battery_of_match,
        },
-       .probe_new = rt5033_battery_probe,
+       .probe = rt5033_battery_probe,
        .remove = rt5033_battery_remove,
        .id_table = rt5033_battery_id,
 };

diff --git a/drivers/power/supply/rt9455_charger.c b/drivers/power/supply/rt9455_charger.c
index 0149e00..ff4dcf7 100644 (file)
--- a/drivers/power/supply/rt9455_charger.c
+++ b/drivers/power/supply/rt9455_charger.c
@@ -1737,7 +1737,7 @@ MODULE_DEVICE_TABLE(acpi, rt9455_i2c_acpi_match);
 #endif
 
 static struct i2c_driver rt9455_driver = {
-       .probe_new      = rt9455_probe,
+       .probe          = rt9455_probe,
        .remove         = rt9455_remove,
        .id_table       = rt9455_i2c_id_table,
        .driver = {

diff --git a/drivers/power/supply/rt9467-charger.c b/drivers/power/supply/rt9467-charger.c
index 73f744a..9ef759a 100644 (file)
--- a/drivers/power/supply/rt9467-charger.c
+++ b/drivers/power/supply/rt9467-charger.c
@@ -1272,7 +1272,7 @@ static struct i2c_driver rt9467_charger_driver = {
                .name = "rt9467-charger",
                .of_match_table = rt9467_charger_of_match_table,
        },
-       .probe_new = rt9467_charger_probe,
+       .probe = rt9467_charger_probe,
 };
 module_i2c_driver(rt9467_charger_driver);
 

diff --git a/drivers/power/supply/rt9471.c b/drivers/power/supply/rt9471.c
index 1ea4087..868b070 100644 (file)
--- a/drivers/power/supply/rt9471.c
+++ b/drivers/power/supply/rt9471.c
@@ -919,7 +919,7 @@ static struct i2c_driver rt9471_driver = {
                .name = "rt9471",
                .of_match_table = rt9471_of_device_id,
        },
-       .probe_new = rt9471_probe,
+       .probe = rt9471_probe,
        .shutdown = rt9471_shutdown,
 };
 module_i2c_driver(rt9471_driver);

diff --git a/drivers/power/supply/sbs-battery.c b/drivers/power/supply/sbs-battery.c
index c4a95b0..62a354e 100644 (file)
--- a/drivers/power/supply/sbs-battery.c
+++ b/drivers/power/supply/sbs-battery.c
@@ -1275,7 +1275,7 @@ static const struct of_device_id sbs_dt_ids[] = {
 MODULE_DEVICE_TABLE(of, sbs_dt_ids);
 
 static struct i2c_driver sbs_battery_driver = {
-       .probe_new      = sbs_probe,
+       .probe          = sbs_probe,
        .alert          = sbs_alert,
        .id_table       = sbs_id,
        .driver = {

diff --git a/drivers/power/supply/sbs-charger.c b/drivers/power/supply/sbs-charger.c
index 75ebcbf..3fd7145 100644 (file)
--- a/drivers/power/supply/sbs-charger.c
+++ b/drivers/power/supply/sbs-charger.c
@@ -240,7 +240,7 @@ static const struct i2c_device_id sbs_id[] = {
 MODULE_DEVICE_TABLE(i2c, sbs_id);
 
 static struct i2c_driver sbs_driver = {
-       .probe_new      = sbs_probe,
+       .probe          = sbs_probe,
        .id_table       = sbs_id,
        .driver = {
                .name   = "sbs-charger",

diff --git a/drivers/power/supply/sbs-manager.c b/drivers/power/supply/sbs-manager.c
index bde9773..9e4141c 100644 (file)
--- a/drivers/power/supply/sbs-manager.c
+++ b/drivers/power/supply/sbs-manager.c
@@ -409,7 +409,7 @@ static struct i2c_driver sbsm_driver = {
                .name = "sbsm",
                .of_match_table = of_match_ptr(sbsm_dt_ids),
        },
-       .probe_new      = sbsm_probe,
+       .probe          = sbsm_probe,
        .alert          = sbsm_alert,
        .id_table       = sbsm_ids
 };

diff --git a/drivers/power/supply/smb347-charger.c b/drivers/power/supply/smb347-charger.c
index b5f0383..c839293 100644 (file)
--- a/drivers/power/supply/smb347-charger.c
+++ b/drivers/power/supply/smb347-charger.c
@@ -1629,7 +1629,7 @@ static struct i2c_driver smb347_driver = {
                .name = "smb347",
                .of_match_table = smb3xx_of_match,
        },
-       .probe_new = smb347_probe,
+       .probe = smb347_probe,
        .remove = smb347_remove,
        .shutdown = smb347_shutdown,
        .id_table = smb347_id,

diff --git a/drivers/power/supply/ucs1002_power.c b/drivers/power/supply/ucs1002_power.c
index 836d44c..954feba 100644 (file)
--- a/drivers/power/supply/ucs1002_power.c
+++ b/drivers/power/supply/ucs1002_power.c
@@ -680,7 +680,7 @@ static struct i2c_driver ucs1002_driver = {
                   .name = "ucs1002",
                   .of_match_table = ucs1002_of_match,
        },
-       .probe_new = ucs1002_probe,
+       .probe = ucs1002_probe,
 };
 module_i2c_driver(ucs1002_driver);
 

diff --git a/drivers/power/supply/ug3105_battery.c b/drivers/power/supply/ug3105_battery.c
index fbc9668..ccc5c4d 100644 (file)
--- a/drivers/power/supply/ug3105_battery.c
+++ b/drivers/power/supply/ug3105_battery.c
@@ -476,7 +476,7 @@ static struct i2c_driver ug3105_i2c_driver = {
                .name = "ug3105",
                .pm = &ug3105_pm_ops,
        },
-       .probe_new = ug3105_probe,
+       .probe = ug3105_probe,
        .id_table = ug3105_id,
 };
 module_i2c_driver(ug3105_i2c_driver);