regulator: act8865-regulator: Convert to i2c's .probe_new()
authorUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Fri, 18 Nov 2022 22:44:32 +0000 (23:44 +0100)
committerMark Brown <broonie@kernel.org>
Thu, 24 Nov 2022 13:54:00 +0000 (13:54 +0000)
.probe_new() doesn't get the i2c_device_id * parameter, so determine
that explicitly in the probe function.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Acked-for-MFD-by: Lee Jones <lee@kernel.org>
Acked-for-Backlight-by: Lee Jones <lee@kernel.org>
Link: https://lore.kernel.org/r/20221118224540.619276-539-uwe@kleine-koenig.org
Signed-off-by: Mark Brown <broonie@kernel.org>
drivers/regulator/act8865-regulator.c

index 19b9742c9eccaa21a5a43c9a90be60306a346fda..53f2c75cdeb41d6eba07c2b83234c7475a44a806 100644 (file)
@@ -651,9 +651,9 @@ static int act8600_charger_probe(struct device *dev, struct regmap *regmap)
        return PTR_ERR_OR_ZERO(charger);
 }
 
-static int act8865_pmic_probe(struct i2c_client *client,
-                             const struct i2c_device_id *i2c_id)
+static int act8865_pmic_probe(struct i2c_client *client)
 {
+       const struct i2c_device_id *i2c_id = i2c_client_get_device_id(client);
        const struct regulator_desc *regulators;
        struct act8865_platform_data *pdata = NULL;
        struct device *dev = &client->dev;
@@ -790,7 +790,7 @@ static struct i2c_driver act8865_pmic_driver = {
        .driver = {
                .name   = "act8865",
        },
-       .probe          = act8865_pmic_probe,
+       .probe_new      = act8865_pmic_probe,
        .id_table       = act8865_ids,
 };