pinctrl: sx150x: Convert to i2c's .probe_new()
authorUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Fri, 18 Nov 2022 22:44:05 +0000 (23:44 +0100)
committerLinus Walleij <linus.walleij@linaro.org>
Mon, 16 Jan 2023 12:40:32 +0000 (13:40 +0100)
.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>
Link: https://lore.kernel.org/r/20221118224540.619276-512-uwe@kleine-koenig.org
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
drivers/pinctrl/pinctrl-sx150x.c

index a87ea3b..0b5ff99 100644 (file)
@@ -1094,9 +1094,9 @@ static const struct regmap_config sx150x_regmap_config = {
        .volatile_reg = sx150x_reg_volatile,
 };
 
-static int sx150x_probe(struct i2c_client *client,
-                       const struct i2c_device_id *id)
+static int sx150x_probe(struct i2c_client *client)
 {
+       const struct i2c_device_id *id = i2c_client_get_device_id(client);
        static const u32 i2c_funcs = I2C_FUNC_SMBUS_BYTE_DATA |
                                     I2C_FUNC_SMBUS_WRITE_WORD_DATA;
        struct device *dev = &client->dev;
@@ -1252,7 +1252,7 @@ static struct i2c_driver sx150x_driver = {
                .name = "sx150x-pinctrl",
                .of_match_table = of_match_ptr(sx150x_of_match),
        },
-       .probe    = sx150x_probe,
+       .probe_new = sx150x_probe,
        .id_table = sx150x_id,
 };