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 840db629a46c34cdec1b8940065f1db34699aa3f..3e3a0d118ce5a5f6427b9e1f70d14cf897f3c419 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 250362e15c98ba2c18e23f5dccf4f3e23a8fcc56..086dcf4033c178fedf1459b6420aea93764c60f4 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 349b69d634e66dfc266a2f679cd4f09f5904839b..6a4798a62588b4fbb9f86dbcfdda9cfe2cb22f59 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 de67b985f0a913a355ea3c27e3897d7373b78db2..baa4c9395bc85292511cea5d1ae0cc99a96a1e32 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 45e4ba30da98c8bbcd233180e5c1a692ba29e9fd..2852860abf861c80cc207a1be8ab272f1184dfaa 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 cfca3a82d5a8d0d0bddf4a277f8b81ab0eb9a494..8efceeae864c81beda3b8c62198ab2769c81cdee 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 da224ae8dc6155e6e1b97bbd5e1cd5f1e6864efa..1dbacc9b015d75209067d457394853fdb4838d6d 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 5ef93d0603c6b908ec0dfb5ebc7086feec49351f..82d3cd5ee2f92f27f135469d8fe8f9468f7dee8f 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 22cde35eb144c612edc491307c06f5dddad9e3ab..b82e702adced02a667ac925f1c36f1650dfd22ff 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 a59d9762bc91684aa73fa3bd49d40bb5c7fa0eb1..d8411722266f518a5e1894e93e70b04c0d245661 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 f8768997333bc59412d040cee7427efad086a7f2..08643154f2f5b699f59116c6865e53f299706df0 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 473522b4326adc5f84aebfbf8962e2b7e2ef1089..bb29e9ebd24a8eb2b96f5a1513f02419aa14d043 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 9b9619246902c66e5541302b19e7693a558155c6..85aa9c465aa4e18536e9e7bfdd2ad2f353d442b3 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 00221e9c0bfccf90a95880e9832e8152788103c7..82263646ddc61f00794081f3fd1e63cee923a6a6 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 dc42d354b892daf641e1a7c6c1cd02d6b9949bb9..0875391f7ac6b4e11be854c74ad6dba0a3bbfcbd 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 d3fb42825983939fdd9335a6f0fc0174f43662a4..cad39a8f829dd1f25e81e333ac6286df4eae7847 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 285580845e2f9544bb019b480570a38ea12bac0a..ec5b4a20ad43d799871a1d22a7409a83cc065225 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 0d0180fcfa63bb8918432bd10df331df2e8d1070..fbdf12cf64ebd4c9738008b46211244c06a676cb 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 d1075959dd466b402730e0e16e04d9662fb65631..22ea7de47a5370657c1085fabf9fff4772925c24 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 6a2d00d95a39dea5ebaa0e700e6d72033ac4bd23..17ac2ab78c4e4c3782298749840a478e6c769f13 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 4fed745119312532f7f42bc838cbc62357a92578..99659dc8f5a6df48e0e9bd26960f0e4448f41f34 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 5c04cf30521931c74d52a39cabd502553011faf0..465c1a9c6a89c075c61042bdb79f7a9d8ad7b8ca 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 0149e00f2bf8a1226927dadf5e31c76af5c8e77f..ff4dcf77c78893c4d65f856b1c2a0feabd44c561 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 73f744a3155d4ce55011d26310173b6eb69803cb..9ef759a9eb2e17359f4cde8e61b736cdab31019b 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 1ea40876494bc120317f426000eb485eb034fd9a..868b0703d15c52fc096f3de89002d0f31ee73e3c 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 c4a95b01463aef9e0e2ca0fba6ed434fbafa5cc5..62a354e0120455cf18536096a7e8d985b07c1d9a 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 75ebcbf0a7883750b009ef21a6bd10692f138b1a..3fd7145acb0da3a1f01b0610043ff859d1ccd7ac 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 bde977391fd4c172304e08c9f2430b3d9c97042d..9e4141cffbf930db67d1128d901eb7d5476d0bf8 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 b5f0383102824ebfface63580aae6e9f722801f5..c8392933ee285255438a78f5bbd9429f9f1c6764 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 836d44c9fb74f75cddafc5472d256ef7025cfb69..954feba6600b8aa7751386ee4ee7b515192312a9 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 fbc9668425094dbfa047b63da8659af1b1ca8394..ccc5c4d2e2308195b40a79f8fe6b4f12663d5ec5 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);