mfd: Switch i2c drivers back to use .probe()
Subsystems (24)
PATCH v2 1/1 mfd: 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.
---
Changes since (implicit) v1:
- Rebase on top of mfd-for-next from
git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git and resolve a conflict with commit c20e8c5b1203 ("mfd: rk808: Split into core and i2c")
drivers/mfd/88pm800.c | 2 +- drivers/mfd/88pm805.c | 2 +- drivers/mfd/88pm860x-core.c | 2 +- drivers/mfd/aat2870-core.c | 2 +- drivers/mfd/acer-ec-a500.c | 2 +- drivers/mfd/act8945a.c | 2 +- drivers/mfd/adp5520.c | 2 +- drivers/mfd/arizona-i2c.c | 2 +- drivers/mfd/as3711.c | 2 +- drivers/mfd/as3722.c | 2 +- drivers/mfd/atc260x-i2c.c | 2 +- drivers/mfd/axp20x-i2c.c | 2 +- drivers/mfd/bcm590xx.c | 2 +- drivers/mfd/bd9571mwv.c | 2 +- drivers/mfd/da903x.c | 2 +- drivers/mfd/da9052-i2c.c | 2 +- drivers/mfd/da9055-i2c.c | 2 +- drivers/mfd/da9062-core.c | 2 +- drivers/mfd/da9063-i2c.c | 2 +- drivers/mfd/da9150-core.c | 2 +- drivers/mfd/ene-kb3930.c | 2 +- drivers/mfd/gateworks-gsc.c | 2 +- drivers/mfd/intel_soc_pmic_chtdc_ti.c | 2 +- drivers/mfd/intel_soc_pmic_chtwc.c | 2 +- drivers/mfd/intel_soc_pmic_crc.c | 2 +- drivers/mfd/iqs62x.c | 2 +- drivers/mfd/khadas-mcu.c | 2 +- drivers/mfd/lm3533-core.c | 2 +- drivers/mfd/lochnagar-i2c.c | 2 +- drivers/mfd/lp3943.c | 2 +- drivers/mfd/lp873x.c | 2 +- drivers/mfd/lp87565.c | 2 +- drivers/mfd/lp8788.c | 2 +- drivers/mfd/madera-i2c.c | 2 +- drivers/mfd/max14577.c | 2 +- drivers/mfd/max77620.c | 2 +- drivers/mfd/max77650.c | 2 +- drivers/mfd/max77686.c | 2 +- drivers/mfd/max77693.c | 2 +- drivers/mfd/max77714.c | 2 +- drivers/mfd/max77843.c | 2 +- drivers/mfd/max8907.c | 2 +- drivers/mfd/max8925-i2c.c | 2 +- drivers/mfd/max8997.c | 2 +- drivers/mfd/max8998.c | 2 +- drivers/mfd/mc13xxx-i2c.c | 2 +- drivers/mfd/menelaus.c | 2 +- drivers/mfd/menf21bmc.c | 2 +- drivers/mfd/mp2629.c | 2 +- drivers/mfd/mt6360-core.c | 2 +- drivers/mfd/mt6370.c | 2 +- drivers/mfd/ntxec.c | 2 +- drivers/mfd/palmas.c | 2 +- drivers/mfd/pcf50633-core.c | 2 +- drivers/mfd/qcom-pm8008.c | 2 +- drivers/mfd/rc5t583.c | 2 +- drivers/mfd/retu-mfd.c | 2 +- drivers/mfd/rk8xx-i2c.c | 2 +- drivers/mfd/rn5t618.c | 2 +- drivers/mfd/rohm-bd71828.c | 2 +- drivers/mfd/rohm-bd718x7.c | 2 +- drivers/mfd/rohm-bd9576.c | 2 +- drivers/mfd/rsmu_i2c.c | 2 +- drivers/mfd/rt4831.c | 2 +- drivers/mfd/rt5033.c | 2 +- drivers/mfd/rt5120.c | 2 +- drivers/mfd/sec-core.c | 2 +- drivers/mfd/si476x-i2c.c | 2 +- drivers/mfd/simple-mfd-i2c.c | 2 +- drivers/mfd/sky81452.c | 2 +- drivers/mfd/smpro-core.c | 2 +- drivers/mfd/stmfx.c | 2 +- drivers/mfd/stmpe-i2c.c | 2 +- drivers/mfd/stpmic1.c | 2 +- drivers/mfd/stw481x.c | 2 +- drivers/mfd/tc3589x.c | 2 +- drivers/mfd/ti-lmu.c | 2 +- drivers/mfd/tps6105x.c | 2 +- drivers/mfd/tps65010.c | 2 +- drivers/mfd/tps6507x.c | 2 +- drivers/mfd/tps65086.c | 2 +- drivers/mfd/tps65090.c | 2 +- drivers/mfd/tps65217.c | 2 +- drivers/mfd/tps65218.c | 2 +- drivers/mfd/tps65219.c | 2 +- drivers/mfd/tps6586x.c | 2 +- drivers/mfd/tps65910.c | 2 +- drivers/mfd/tps65912-i2c.c | 2 +- drivers/mfd/twl-core.c | 2 +- drivers/mfd/twl6040.c | 2 +- drivers/mfd/wl1273-core.c | 2 +- drivers/mfd/wm831x-i2c.c | 2 +- drivers/mfd/wm8350-i2c.c | 2 +- drivers/mfd/wm8400-core.c | 2 +- drivers/mfd/wm8994-core.c | 2 +- 95 files changed, 95 insertions(+), 95 deletions(-)
drivers/mfd/88pm800.c +1 -1
@@ -597,7 +597,7 @@ static struct i2c_driver pm800_driver = { .name = "88PM800", .pm = pm_sleep_ptr(&pm80x_pm_ops), }, - .probe_new = pm800_probe, + .probe = pm800_probe, .remove = pm800_remove, .id_table = pm80x_id_table, };
drivers/mfd/88pm805.c +1 -1
@@ -253,7 +253,7 @@ static struct i2c_driver pm805_driver = { .name = "88PM805", .pm = pm_sleep_ptr(&pm80x_pm_ops), }, - .probe_new = pm805_probe, + .probe = pm805_probe, .remove = pm805_remove, .id_table = pm80x_id_table, };
drivers/mfd/88pm860x-core.c +1 -1
@@ -1250,7 +1250,7 @@ static struct i2c_driver pm860x_driver = { .pm = pm_sleep_ptr(&pm860x_pm_ops), .of_match_table = pm860x_dt_ids, }, - .probe_new = pm860x_probe, + .probe = pm860x_probe, .remove = pm860x_remove, .id_table = pm860x_id_table, };
drivers/mfd/aat2870-core.c +1 -1
@@ -449,7 +449,7 @@ static struct i2c_driver aat2870_i2c_driver = { .pm = pm_sleep_ptr(&aat2870_pm_ops), .suppress_bind_attrs = true, }, - .probe_new = aat2870_i2c_probe, + .probe = aat2870_i2c_probe, .id_table = aat2870_i2c_id_table, };
drivers/mfd/acer-ec-a500.c +1 -1
@@ -190,7 +190,7 @@ static struct i2c_driver a500_ec_driver = { .name = "acer-a500-embedded-controller", .of_match_table = a500_ec_match, }, - .probe_new = a500_ec_probe, + .probe = a500_ec_probe, .remove = a500_ec_remove, };module_i2c_driver (a500_ec_driver);
drivers/mfd/act8945a.c +1 -1
@@ -70,7 +70,7 @@ static struct i2c_driver act8945a_i2c_driver = { .name = "act8945a", .of_match_table = of_match_ptr(act8945a_of_match), }, - .probe_new = act8945a_i2c_probe, + .probe = act8945a_i2c_probe, .id_table = act8945a_i2c_id, };
drivers/mfd/adp5520.c +1 -1
@@ -340,7 +340,7 @@ static struct i2c_driver adp5520_driver = { .pm = pm_sleep_ptr(&adp5520_pm), .suppress_bind_attrs = true, }, - .probe_new = adp5520_probe, + .probe = adp5520_probe, .id_table = adp5520_id, };builtin_i2c_driver (adp5520_driver);
drivers/mfd/arizona-i2c.c +1 -1
@@ -121,7 +121,7 @@ static struct i2c_driver arizona_i2c_driver = { .pm = pm_ptr(&arizona_pm_ops), .of_match_table = of_match_ptr(arizona_i2c_of_match), }, - .probe_new = arizona_i2c_probe, + .probe = arizona_i2c_probe, .remove = arizona_i2c_remove, .id_table = arizona_i2c_id, };
drivers/mfd/as3711.c +1 -1
@@ -201,7 +201,7 @@ static struct i2c_driver as3711_i2c_driver = { .name = "as3711", .of_match_table = of_match_ptr(as3711_of_match), }, - .probe_new = as3711_i2c_probe, + .probe = as3711_i2c_probe, .id_table = as3711_i2c_id, };
drivers/mfd/as3722.c +1 -1
@@ -445,7 +445,7 @@ static struct i2c_driver as3722_i2c_driver = { .of_match_table = as3722_of_match, .pm = &as3722_pm_ops, }, - .probe_new = as3722_i2c_probe, + .probe = as3722_i2c_probe, .id_table = as3722_i2c_id, };
drivers/mfd/atc260x-i2c.c +1 -1
@@ -53,7 +53,7 @@ static struct i2c_driver atc260x_i2c_driver = { .name = "atc260x", .of_match_table = atc260x_i2c_of_match, }, - .probe_new = atc260x_i2c_probe, + .probe = atc260x_i2c_probe, };module_i2c_driver (atc260x_i2c_driver);
drivers/mfd/axp20x-i2c.c +1 -1
@@ -103,7 +103,7 @@ static struct i2c_driver axp20x_i2c_driver = { .of_match_table = of_match_ptr(axp20x_i2c_of_match), .acpi_match_table = ACPI_PTR(axp20x_i2c_acpi_match), }, - .probe_new = axp20x_i2c_probe, + .probe = axp20x_i2c_probe, .remove = axp20x_i2c_remove, .id_table = axp20x_i2c_id, };
drivers/mfd/bcm590xx.c +1 -1
@@ -108,7 +108,7 @@ static struct i2c_driver bcm590xx_i2c_driver = { .name = "bcm590xx", .of_match_table = bcm590xx_of_match, }, - .probe_new = bcm590xx_i2c_probe, + .probe = bcm590xx_i2c_probe, .id_table = bcm590xx_i2c_id, };module_i2c_driver (bcm590xx_i2c_driver);
drivers/mfd/bd9571mwv.c +1 -1
@@ -278,7 +278,7 @@ static struct i2c_driver bd9571mwv_driver = { .name = "bd9571mwv", .of_match_table = bd9571mwv_of_match_table, }, - .probe_new = bd9571mwv_probe, + .probe = bd9571mwv_probe, .id_table = bd9571mwv_id_table, };module_i2c_driver (bd9571mwv_driver);
drivers/mfd/da903x.c +1 -1
@@ -543,7 +543,7 @@ static struct i2c_driver da903x_driver = { .driver = { .name = "da903x", }, - .probe_new = da903x_probe, + .probe = da903x_probe, .remove = da903x_remove, .id_table = da903x_id_table, };
drivers/mfd/da9052-i2c.c +1 -1
@@ -176,7 +176,7 @@ static void da9052_i2c_remove(struct i2c_client *client) }static struct i2c_driver da9052_i2c_driver = { - .probe_new = da9052_i2c_probe, + .probe = da9052_i2c_probe, .remove = da9052_i2c_remove, .id_table = da9052_i2c_id, .driver = {
drivers/mfd/da9055-i2c.c +1 -1
@@ -66,7 +66,7 @@ static const struct of_device_id da9055_of_match[] = { };static struct i2c_driver da9055_i2c_driver = { - .probe_new = da9055_i2c_probe, + .probe = da9055_i2c_probe, .remove = da9055_i2c_remove, .id_table = da9055_i2c_id, .driver = {
drivers/mfd/da9062-core.c +1 -1
@@ -726,7 +726,7 @@ static struct i2c_driver da9062_i2c_driver = { .name = "da9062", .of_match_table = da9062_dt_ids, }, - .probe_new = da9062_i2c_probe, + .probe = da9062_i2c_probe, .remove = da9062_i2c_remove, .id_table = da9062_i2c_id, };
drivers/mfd/da9063-i2c.c +1 -1
@@ -469,7 +469,7 @@ static struct i2c_driver da9063_i2c_driver = { .name = "da9063", .of_match_table = da9063_dt_ids, }, - .probe_new = da9063_i2c_probe, + .probe = da9063_i2c_probe, .id_table = da9063_i2c_id, };
drivers/mfd/da9150-core.c +1 -1
@@ -510,7 +510,7 @@ static struct i2c_driver da9150_driver = { .name = "da9150", .of_match_table = da9150_of_match, }, - .probe_new = da9150_probe, + .probe = da9150_probe, .remove = da9150_remove, .shutdown = da9150_shutdown, .id_table = da9150_i2c_id,
drivers/mfd/ene-kb3930.c +1 -1
@@ -196,7 +196,7 @@ static const struct of_device_id kb3930_dt_ids[] = {MODULE_DEVICE_TABLE (of, kb3930_dt_ids);static struct i2c_driver kb3930_driver = { - .probe_new = kb3930_probe, + .probe = kb3930_probe, .remove = kb3930_remove, .driver = { .name ="ene-kb3930" ,
drivers/mfd/gateworks-gsc.c +1 -1
@@ -264,7 +264,7 @@ static struct i2c_driver gsc_driver = { .name = "gateworks-gsc", .of_match_table = gsc_of_match, }, - .probe_new = gsc_probe, + .probe = gsc_probe, .remove = gsc_remove, };module_i2c_driver (gsc_driver);
drivers/mfd/intel_soc_pmic_chtdc_ti.c +1 -1
@@ -172,7 +172,7 @@ static struct i2c_driver chtdc_ti_i2c_driver = { .pm = pm_sleep_ptr(&chtdc_ti_pm_ops), .acpi_match_table = chtdc_ti_acpi_ids, }, - .probe_new = chtdc_ti_probe, + .probe = chtdc_ti_probe, .shutdown = chtdc_ti_shutdown, };module_i2c_driver (chtdc_ti_i2c_driver);
drivers/mfd/intel_soc_pmic_chtwc.c +1 -1
@@ -272,7 +272,7 @@ static struct i2c_driver cht_wc_driver = { .pm = pm_sleep_ptr(&cht_wc_pm_ops), .acpi_match_table = cht_wc_acpi_ids, }, - .probe_new = cht_wc_probe, + .probe = cht_wc_probe, .shutdown = cht_wc_shutdown, .id_table = cht_wc_i2c_id, };
drivers/mfd/intel_soc_pmic_crc.c +1 -1
@@ -263,7 +263,7 @@ static struct i2c_driver crystal_cove_i2c_driver = { .pm = pm_sleep_ptr(&crystal_cove_pm_ops), .acpi_match_table = crystal_cove_acpi_match, }, - .probe_new = crystal_cove_i2c_probe, + .probe = crystal_cove_i2c_probe, .remove = crystal_cove_i2c_remove, .shutdown = crystal_cove_shutdown, };
drivers/mfd/iqs62x.c +1 -1
@@ -1069,7 +1069,7 @@ static struct i2c_driver iqs62x_i2c_driver = { .of_match_table = iqs62x_of_match, .pm = &iqs62x_pm, }, - .probe_new = iqs62x_probe, + .probe = iqs62x_probe, .remove = iqs62x_remove, };module_i2c_driver (iqs62x_i2c_driver);
drivers/mfd/khadas-mcu.c +1 -1
@@ -134,7 +134,7 @@ static struct i2c_driver khadas_mcu_driver = { .name = "khadas-mcu-core", .of_match_table = of_match_ptr(khadas_mcu_of_match), }, - .probe_new = khadas_mcu_probe, + .probe = khadas_mcu_probe, };module_i2c_driver (khadas_mcu_driver);
drivers/mfd/lm3533-core.c +1 -1
@@ -624,7 +624,7 @@ static struct i2c_driver lm3533_i2c_driver = { .name = "lm3533", }, .id_table = lm3533_i2c_ids, - .probe_new = lm3533_i2c_probe, + .probe = lm3533_i2c_probe, .remove = lm3533_i2c_remove, };
drivers/mfd/lochnagar-i2c.c +1 -1
@@ -382,7 +382,7 @@ static struct i2c_driver lochnagar_i2c_driver = { .of_match_table = of_match_ptr(lochnagar_of_match), .suppress_bind_attrs = true, }, - .probe_new = lochnagar_i2c_probe, + .probe = lochnagar_i2c_probe, };static int __init lochnagar_i2c_init (void )
drivers/mfd/lp3943.c +1 -1
@@ -140,7 +140,7 @@ MODULE_DEVICE_TABLE(of, lp3943_of_match);#endif static struct i2c_driver lp3943_driver = { - .probe_new = lp3943_probe, + .probe = lp3943_probe, .driver = { .name ="lp3943" , .of_match_table =of_match_ptr (lp3943_of_match),
drivers/mfd/lp873x.c +1 -1
@@ -78,7 +78,7 @@ static struct i2c_driver lp873x_driver = { .name = "lp873x", .of_match_table = of_lp873x_match_table, }, - .probe_new = lp873x_probe, + .probe = lp873x_probe, .id_table = lp873x_id_table, };module_i2c_driver (lp873x_driver);
drivers/mfd/lp87565.c +1 -1
@@ -119,7 +119,7 @@ static struct i2c_driver lp87565_driver = { .name = "lp87565", .of_match_table = of_lp87565_match_table, }, - .probe_new = lp87565_probe, + .probe = lp87565_probe, .shutdown = lp87565_shutdown, .id_table = lp87565_id_table, };
drivers/mfd/lp8788.c +1 -1
@@ -225,7 +225,7 @@ static struct i2c_driver lp8788_driver = { .driver = { .name = "lp8788", }, - .probe_new = lp8788_probe, + .probe = lp8788_probe, .remove = lp8788_remove, .id_table = lp8788_ids, };
drivers/mfd/madera-i2c.c +1 -1
@@ -139,7 +139,7 @@ static struct i2c_driver madera_i2c_driver = { .pm = &madera_pm_ops, .of_match_table = of_match_ptr(madera_of_match), }, - .probe_new = madera_i2c_probe, + .probe = madera_i2c_probe, .remove = madera_i2c_remove, .id_table = madera_i2c_id, };
drivers/mfd/max14577.c +1 -1
@@ -518,7 +518,7 @@ static struct i2c_driver max14577_i2c_driver = { .pm = pm_sleep_ptr(&max14577_pm), .of_match_table = max14577_dt_match, }, - .probe_new = max14577_i2c_probe, + .probe = max14577_i2c_probe, .remove = max14577_i2c_remove, .id_table = max14577_i2c_id, };
drivers/mfd/max77620.c +1 -1
@@ -698,7 +698,7 @@ static struct i2c_driver max77620_driver = { .name = "max77620", .pm = pm_sleep_ptr(&max77620_pm_ops), }, - .probe_new = max77620_probe, + .probe = max77620_probe, .id_table = max77620_id, };builtin_i2c_driver (max77620_driver);
drivers/mfd/max77650.c +1 -1
@@ -222,7 +222,7 @@ static struct i2c_driver max77650_i2c_driver = { .name = "max77650", .of_match_table = max77650_of_match, }, - .probe_new = max77650_i2c_probe, + .probe = max77650_i2c_probe, };module_i2c_driver (max77650_i2c_driver);
drivers/mfd/max77686.c +1 -1
@@ -269,7 +269,7 @@ static struct i2c_driver max77686_i2c_driver = { .pm = pm_sleep_ptr(&max77686_pm), .of_match_table = max77686_pmic_dt_match, }, - .probe_new = max77686_i2c_probe, + .probe = max77686_i2c_probe, };module_i2c_driver (max77686_i2c_driver);
drivers/mfd/max77693.c +1 -1
@@ -356,7 +356,7 @@ static struct i2c_driver max77693_i2c_driver = { .pm = &max77693_pm, .of_match_table = of_match_ptr(max77693_dt_match), }, - .probe_new = max77693_i2c_probe, + .probe = max77693_i2c_probe, .remove = max77693_i2c_remove, .id_table = max77693_i2c_id, };
drivers/mfd/max77714.c +1 -1
@@ -143,7 +143,7 @@ static struct i2c_driver max77714_driver = { .name = "max77714", .of_match_table = max77714_dt_match, }, - .probe_new = max77714_probe, + .probe = max77714_probe, };module_i2c_driver (max77714_driver);
drivers/mfd/max77843.c +1 -1
@@ -207,7 +207,7 @@ static struct i2c_driver max77843_i2c_driver = { .of_match_table = max77843_dt_match, .suppress_bind_attrs = true, }, - .probe_new = max77843_probe, + .probe = max77843_probe, .id_table = max77843_id, };
drivers/mfd/max8907.c +1 -1
@@ -311,7 +311,7 @@ static struct i2c_driver max8907_i2c_driver = { .name = "max8907", .of_match_table = of_match_ptr(max8907_of_match), }, - .probe_new = max8907_i2c_probe, + .probe = max8907_i2c_probe, .remove = max8907_i2c_remove, .id_table = max8907_i2c_id, };
drivers/mfd/max8925-i2c.c +1 -1
@@ -239,7 +239,7 @@ static struct i2c_driver max8925_driver = { .pm = pm_sleep_ptr(&max8925_pm_ops), .of_match_table = max8925_dt_ids, }, - .probe_new = max8925_probe, + .probe = max8925_probe, .remove = max8925_remove, .id_table = max8925_id_table, };
drivers/mfd/max8997.c +1 -1
@@ -478,7 +478,7 @@ static struct i2c_driver max8997_i2c_driver = { .suppress_bind_attrs = true, .of_match_table = of_match_ptr(max8997_pmic_dt_match), }, - .probe_new = max8997_i2c_probe, + .probe = max8997_i2c_probe, .id_table = max8997_i2c_id, };
drivers/mfd/max8998.c +1 -1
@@ -348,7 +348,7 @@ static struct i2c_driver max8998_i2c_driver = { .suppress_bind_attrs = true, .of_match_table = of_match_ptr(max8998_dt_match), }, - .probe_new = max8998_i2c_probe, + .probe = max8998_i2c_probe, .id_table = max8998_i2c_id, };
drivers/mfd/mc13xxx-i2c.c +1 -1
@@ -95,7 +95,7 @@ static struct i2c_driver mc13xxx_i2c_driver = { .name = "mc13xxx", .of_match_table = mc13xxx_dt_ids, }, - .probe_new = mc13xxx_i2c_probe, + .probe = mc13xxx_i2c_probe, .remove = mc13xxx_i2c_remove, };
drivers/mfd/menelaus.c +1 -1
@@ -1240,7 +1240,7 @@ static struct i2c_driver menelaus_i2c_driver = { .driver = { .name = DRIVER_NAME, }, - .probe_new = menelaus_probe, + .probe = menelaus_probe, .remove = menelaus_remove, .id_table = menelaus_id, };
drivers/mfd/menf21bmc.c +1 -1
@@ -111,7 +111,7 @@ MODULE_DEVICE_TABLE(i2c, menf21bmc_id_table);static struct i2c_driver menf21bmc_driver = { .driver.name ="menf21bmc" , .id_table = menf21bmc_id_table, - .probe_new = menf21bmc_probe, + .probe = menf21bmc_probe, };module_i2c_driver (menf21bmc_driver);
drivers/mfd/mp2629.c +1 -1
@@ -70,7 +70,7 @@ static struct i2c_driver mp2629_driver = { .name = "mp2629", .of_match_table = mp2629_of_match, }, - .probe_new = mp2629_probe, + .probe = mp2629_probe, };module_i2c_driver (mp2629_driver);
drivers/mfd/mt6360-core.c +1 -1
@@ -623,7 +623,7 @@ static struct i2c_driver mt6360_driver = { .pm = &mt6360_pm_ops, .of_match_table = of_match_ptr(mt6360_of_id), }, - .probe_new = mt6360_probe, + .probe = mt6360_probe, };module_i2c_driver (mt6360_driver);
drivers/mfd/mt6370.c +1 -1
@@ -303,7 +303,7 @@ static struct i2c_driver mt6370_driver = { .name = "mt6370", .of_match_table = mt6370_match_table, }, - .probe_new = mt6370_probe, + .probe = mt6370_probe, };module_i2c_driver (mt6370_driver);
drivers/mfd/ntxec.c +1 -1
@@ -260,7 +260,7 @@ static struct i2c_driver ntxec_driver = { .name = "ntxec", .of_match_table = of_ntxec_match_table, }, - .probe_new = ntxec_probe, + .probe = ntxec_probe, .remove = ntxec_remove, };module_i2c_driver (ntxec_driver);
drivers/mfd/palmas.c +1 -1
@@ -725,7 +725,7 @@ static struct i2c_driver palmas_i2c_driver = { .name = "palmas", .of_match_table = of_palmas_match_tbl, }, - .probe_new = palmas_i2c_probe, + .probe = palmas_i2c_probe, .remove = palmas_i2c_remove, .id_table = palmas_i2c_id, };
drivers/mfd/pcf50633-core.c +1 -1
@@ -282,7 +282,7 @@ static struct i2c_driver pcf50633_driver = { .pm = pm_sleep_ptr(&pcf50633_pm), }, .id_table = pcf50633_id_table, - .probe_new = pcf50633_probe, + .probe = pcf50633_probe, .remove = pcf50633_remove, };
drivers/mfd/qcom-pm8008.c +1 -1
@@ -205,7 +205,7 @@ static struct i2c_driver pm8008_mfd_driver = { .name = "pm8008", .of_match_table = pm8008_match, }, - .probe_new = pm8008_probe, + .probe = pm8008_probe, };module_i2c_driver (pm8008_mfd_driver);
drivers/mfd/rc5t583.c +1 -1
@@ -288,7 +288,7 @@ static struct i2c_driver rc5t583_i2c_driver = { .driver = { .name = "rc5t583", }, - .probe_new = rc5t583_i2c_probe, + .probe = rc5t583_i2c_probe, .id_table = rc5t583_i2c_id, };
drivers/mfd/retu-mfd.c +1 -1
@@ -318,7 +318,7 @@ static struct i2c_driver retu_driver = { .name = "retu-mfd", .of_match_table = retu_of_match, }, - .probe_new = retu_probe, + .probe = retu_probe, .remove = retu_remove, .id_table = retu_id, };
drivers/mfd/rk8xx-i2c.c +1 -1
@@ -173,7 +173,7 @@ static struct i2c_driver rk8xx_i2c_driver = { .of_match_table = rk8xx_i2c_of_match, .pm = &rk8xx_i2c_pm_ops, }, - .probe_new = rk8xx_i2c_probe, + .probe = rk8xx_i2c_probe, .shutdown = rk8xx_i2c_shutdown, };module_i2c_driver (rk8xx_i2c_driver);
drivers/mfd/rn5t618.c +1 -1
@@ -280,7 +280,7 @@ static struct i2c_driver rn5t618_i2c_driver = { .of_match_table = of_match_ptr(rn5t618_of_match), .pm = &rn5t618_i2c_dev_pm_ops, }, - .probe_new = rn5t618_i2c_probe, + .probe = rn5t618_i2c_probe, .remove = rn5t618_i2c_remove, };
drivers/mfd/rohm-bd71828.c +1 -1
@@ -564,7 +564,7 @@ static struct i2c_driver bd71828_drv = { .name = "rohm-bd71828", .of_match_table = bd71828_of_match, }, - .probe_new = &bd71828_i2c_probe, + .probe = bd71828_i2c_probe, };module_i2c_driver (bd71828_drv);
drivers/mfd/rohm-bd718x7.c +1 -1
@@ -208,7 +208,7 @@ static struct i2c_driver bd718xx_i2c_driver = { .name = "rohm-bd718x7", .of_match_table = bd718xx_of_match, }, - .probe_new = bd718xx_i2c_probe, + .probe = bd718xx_i2c_probe, };static int __init bd718xx_i2c_init (void )
drivers/mfd/rohm-bd9576.c +1 -1
@@ -178,7 +178,7 @@ static struct i2c_driver bd957x_drv = { .name = "rohm-bd957x", .of_match_table = bd957x_of_match, }, - .probe_new = &bd957x_i2c_probe, + .probe = bd957x_i2c_probe, };module_i2c_driver (bd957x_drv);
drivers/mfd/rsmu_i2c.c +1 -1
@@ -279,7 +279,7 @@ static struct i2c_driver rsmu_i2c_driver = { .name = "rsmu-i2c", .of_match_table = of_match_ptr(rsmu_i2c_of_match), }, - .probe_new = rsmu_i2c_probe, + .probe = rsmu_i2c_probe, .remove = rsmu_i2c_remove, .id_table = rsmu_i2c_id, };
drivers/mfd/rt4831.c +1 -1
@@ -109,7 +109,7 @@ static struct i2c_driver rt4831_driver = { .name = "rt4831", .of_match_table = rt4831_of_match, }, - .probe_new = rt4831_probe, + .probe = rt4831_probe, .remove = rt4831_remove, };module_i2c_driver (rt4831_driver);
drivers/mfd/rt5033.c +1 -1
@@ -122,7 +122,7 @@ static struct i2c_driver rt5033_driver = { .name = "rt5033", .of_match_table = rt5033_dt_match, }, - .probe_new = rt5033_i2c_probe, + .probe = rt5033_i2c_probe, .id_table = rt5033_i2c_id, };module_i2c_driver (rt5033_driver);
drivers/mfd/rt5120.c +1 -1
@@ -114,7 +114,7 @@ static struct i2c_driver rt5120_driver = { .name = "rt5120", .of_match_table = rt5120_device_match_table, }, - .probe_new = rt5120_probe, + .probe = rt5120_probe, };module_i2c_driver (rt5120_driver);
drivers/mfd/sec-core.c +1 -1
@@ -450,7 +450,7 @@ static struct i2c_driver sec_pmic_driver = { .pm = pm_sleep_ptr(&sec_pmic_pm_ops), .of_match_table = sec_dt_match, }, - .probe_new = sec_pmic_probe, + .probe = sec_pmic_probe, .shutdown = sec_pmic_shutdown, };module_i2c_driver (sec_pmic_driver);
drivers/mfd/si476x-i2c.c +1 -1
@@ -866,7 +866,7 @@ static struct i2c_driver si476x_core_driver = { .driver = { .name = "si476x-core", }, - .probe_new = si476x_core_probe, + .probe = si476x_core_probe, .remove = si476x_core_remove, .id_table = si476x_id, };
drivers/mfd/simple-mfd-i2c.c +1 -1
@@ -93,7 +93,7 @@ static const struct of_device_id simple_mfd_i2c_of_match[] = {MODULE_DEVICE_TABLE (of, simple_mfd_i2c_of_match);static struct i2c_driver simple_mfd_i2c_driver = { - .probe_new = simple_mfd_i2c_probe, + .probe = simple_mfd_i2c_probe, .driver = { .name ="simple-mfd-i2c" , .of_match_table = simple_mfd_i2c_of_match,
drivers/mfd/sky81452.c +1 -1
@@ -77,7 +77,7 @@ static struct i2c_driver sky81452_driver = { .name = "sky81452", .of_match_table = of_match_ptr(sky81452_of_match), }, - .probe_new = sky81452_probe, + .probe = sky81452_probe, .id_table = sky81452_ids, };
drivers/mfd/smpro-core.c +1 -1
@@ -125,7 +125,7 @@ static const struct of_device_id smpro_core_of_match[] = {MODULE_DEVICE_TABLE (of, smpro_core_of_match);static struct i2c_driver smpro_core_driver = { - .probe_new = smpro_core_probe, + .probe = smpro_core_probe, .driver = { .name ="smpro-core" , .of_match_table = smpro_core_of_match,
drivers/mfd/stmfx.c +1 -1
@@ -553,7 +553,7 @@ static struct i2c_driver stmfx_driver = { .of_match_table = stmfx_of_match, .pm = pm_sleep_ptr(&stmfx_dev_pm_ops), }, - .probe_new = stmfx_probe, + .probe = stmfx_probe, .remove = stmfx_remove, };module_i2c_driver (stmfx_driver);
drivers/mfd/stmpe-i2c.c +1 -1
@@ -118,7 +118,7 @@ static struct i2c_driver stmpe_i2c_driver = { .pm = pm_sleep_ptr(&stmpe_dev_pm_ops), .of_match_table = stmpe_of_match, }, - .probe_new = stmpe_i2c_probe, + .probe = stmpe_i2c_probe, .remove = stmpe_i2c_remove, .id_table = stmpe_i2c_id, };
drivers/mfd/stpmic1.c +1 -1
@@ -201,7 +201,7 @@ static struct i2c_driver stpmic1_driver = { .of_match_table = of_match_ptr(stpmic1_of_match), .pm = pm_sleep_ptr(&stpmic1_pm), }, - .probe_new = stpmic1_probe, + .probe = stpmic1_probe, };module_i2c_driver (stpmic1_driver);
drivers/mfd/stw481x.c +1 -1
@@ -239,7 +239,7 @@ static struct i2c_driver stw481x_driver = { .name = "stw481x", .of_match_table = stw481x_match, }, - .probe_new = stw481x_probe, + .probe = stw481x_probe, .id_table = stw481x_id, };
drivers/mfd/tc3589x.c +1 -1
@@ -485,7 +485,7 @@ static struct i2c_driver tc3589x_driver = { .pm = pm_sleep_ptr(&tc3589x_dev_pm_ops), .of_match_table = of_match_ptr(tc3589x_match), }, - .probe_new = tc3589x_probe, + .probe = tc3589x_probe, .remove = tc3589x_remove, .id_table = tc3589x_id, };
drivers/mfd/ti-lmu.c +1 -1
@@ -217,7 +217,7 @@ static const struct i2c_device_id ti_lmu_ids[] = {MODULE_DEVICE_TABLE (i2c, ti_lmu_ids);static struct i2c_driver ti_lmu_driver = { - .probe_new = ti_lmu_probe, + .probe = ti_lmu_probe, .driver = { .name ="ti-lmu" , .of_match_table = ti_lmu_of_match,
drivers/mfd/tps6105x.c +1 -1
@@ -209,7 +209,7 @@ static struct i2c_driver tps6105x_driver = { .name = "tps6105x", .of_match_table = tps6105x_of_match, }, - .probe_new = tps6105x_probe, + .probe = tps6105x_probe, .remove = tps6105x_remove, .id_table = tps6105x_id, };
drivers/mfd/tps65010.c +1 -1
@@ -668,7 +668,7 @@ static struct i2c_driver tps65010_driver = { .driver = { .name = "tps65010", }, - .probe_new = tps65010_probe, + .probe = tps65010_probe, .remove = tps65010_remove, .id_table = tps65010_id, };
drivers/mfd/tps6507x.c +1 -1
@@ -122,7 +122,7 @@ static struct i2c_driver tps6507x_i2c_driver = { .name = "tps6507x", .of_match_table = of_match_ptr(tps6507x_of_match), }, - .probe_new = tps6507x_i2c_probe, + .probe = tps6507x_i2c_probe, .id_table = tps6507x_i2c_id, };
drivers/mfd/tps65086.c +1 -1
@@ -129,7 +129,7 @@ static struct i2c_driver tps65086_driver = { .name = "tps65086", .of_match_table = tps65086_of_match_table, }, - .probe_new = tps65086_probe, + .probe = tps65086_probe, .remove = tps65086_remove, .id_table = tps65086_id_table, };
drivers/mfd/tps65090.c +1 -1
@@ -236,7 +236,7 @@ static struct i2c_driver tps65090_driver = { .suppress_bind_attrs = true, .of_match_table = of_match_ptr(tps65090_of_match), }, - .probe_new = tps65090_i2c_probe, + .probe = tps65090_i2c_probe, .id_table = tps65090_id_table, };
drivers/mfd/tps65217.c +1 -1
@@ -402,7 +402,7 @@ static struct i2c_driver tps65217_driver = { .of_match_table = tps65217_of_match, }, .id_table = tps65217_id_table, - .probe_new = tps65217_probe, + .probe = tps65217_probe, .remove = tps65217_remove, };
drivers/mfd/tps65218.c +1 -1
@@ -347,7 +347,7 @@ static struct i2c_driver tps65218_driver = { .name = "tps65218", .of_match_table = of_tps65218_match_table, }, - .probe_new = tps65218_probe, + .probe = tps65218_probe, .id_table = tps65218_id_table, };
drivers/mfd/tps65219.c +1 -1
@@ -290,7 +290,7 @@ static struct i2c_driver tps65219_driver = { .name = "tps65219", .of_match_table = of_tps65219_match_table, }, - .probe_new = tps65219_probe, + .probe = tps65219_probe, };module_i2c_driver (tps65219_driver);
drivers/mfd/tps6586x.c +1 -1
@@ -619,7 +619,7 @@ static struct i2c_driver tps6586x_driver = { .of_match_table = of_match_ptr(tps6586x_of_match), .pm = &tps6586x_pm_ops, }, - .probe_new = tps6586x_i2c_probe, + .probe = tps6586x_i2c_probe, .remove = tps6586x_i2c_remove, .id_table = tps6586x_id_table, };
drivers/mfd/tps65910.c +1 -1
@@ -535,7 +535,7 @@ static struct i2c_driver tps65910_i2c_driver = { .name = "tps65910", .of_match_table = of_match_ptr(tps65910_of_match), }, - .probe_new = tps65910_i2c_probe, + .probe = tps65910_i2c_probe, .id_table = tps65910_i2c_id, };
drivers/mfd/tps65912-i2c.c +1 -1
@@ -60,7 +60,7 @@ static struct i2c_driver tps65912_i2c_driver = { .name = "tps65912", .of_match_table = tps65912_i2c_of_match_table, }, - .probe_new = tps65912_i2c_probe, + .probe = tps65912_i2c_probe, .remove = tps65912_i2c_remove, .id_table = tps65912_i2c_id_table, };
drivers/mfd/twl-core.c +1 -1
@@ -890,7 +890,7 @@ static struct i2c_driver twl_driver = { .driver.name = DRIVER_NAME, .driver.pm = &twl_dev_pm_ops, .id_table = twl_ids, - .probe_new = twl_probe, + .probe = twl_probe, .remove = twl_remove, };builtin_i2c_driver (twl_driver);
drivers/mfd/twl6040.c +1 -1
@@ -829,7 +829,7 @@ static struct i2c_driver twl6040_driver = { .driver = { .name = "twl6040", }, - .probe_new = twl6040_probe, + .probe = twl6040_probe, .remove = twl6040_remove, .id_table = twl6040_i2c_id, };
drivers/mfd/wl1273-core.c +1 -1
@@ -232,7 +232,7 @@ static struct i2c_driver wl1273_core_driver = { .driver = { .name = WL1273_FM_DRIVER_NAME, }, - .probe_new = wl1273_core_probe, + .probe = wl1273_core_probe, .id_table = wl1273_driver_id_table, };
drivers/mfd/wm831x-i2c.c +1 -1
@@ -102,7 +102,7 @@ static struct i2c_driver wm831x_i2c_driver = { .of_match_table = of_match_ptr(wm831x_of_match), .suppress_bind_attrs = true, }, - .probe_new = wm831x_i2c_probe, + .probe = wm831x_i2c_probe, .id_table = wm831x_i2c_id, };
drivers/mfd/wm8350-i2c.c +1 -1
@@ -52,7 +52,7 @@ static struct i2c_driver wm8350_i2c_driver = { .name = "wm8350", .suppress_bind_attrs = true, }, - .probe_new = wm8350_i2c_probe, + .probe = wm8350_i2c_probe, .id_table = wm8350_i2c_id, };
drivers/mfd/wm8400-core.c +1 -1
@@ -143,7 +143,7 @@ static struct i2c_driver wm8400_i2c_driver = { .driver = { .name = "WM8400", }, - .probe_new = wm8400_i2c_probe, + .probe = wm8400_i2c_probe, .id_table = wm8400_i2c_id, };#endif
drivers/mfd/wm8994-core.c +1 -1
@@ -670,7 +670,7 @@ static struct i2c_driver wm8994_i2c_driver = { .pm = pm_ptr(&wm8994_pm_ops), .of_match_table = wm8994_of_match, }, - .probe_new = wm8994_i2c_probe, + .probe = wm8994_i2c_probe, .remove = wm8994_i2c_remove, .id_table = wm8994_i2c_id, };
base-commit: 9bdc4322bbd17047e014795aacc4e1eaff682cba
Signature · 1 line
2.39.2
Quoted 6 lines · Uwe Kleine-König
After commit
b8a1a4cd5a98("i2c: Provide a temporary .probe_new() call-back type"), all drivers being converted to .probe_new() and then03c835f498b5("i2c: Switch .probe() to not take an id parameter") convert back to (the new) .probe() to be able to eventually drop .probe_new() from structi2c_driver.
Quoted 7 lines
Signed-off-by Uwe Kleine-König <[email protected]>---
Changes since (implicit) v1:
- Rebase on top of mfd-for-next from
git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.gitand resolve a conflict with commitc20e8c5b1203("mfd: rk808: Split into core and i2c")
Good work!
Applied, thanks
Signature · 1 line
Lee Jones [李琼斯]