pinctrl: mcp23s08: Convert to i2c's .probe_new()
authorUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Fri, 18 Nov 2022 22:44:04 +0000 (23:44 +0100)
committerLinus Walleij <linus.walleij@linaro.org>
Tue, 10 Jan 2023 08:00:19 +0000 (09:00 +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-511-uwe@kleine-koenig.org
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
drivers/pinctrl/pinctrl-mcp23s08_i2c.c

index e0b001c8c08c04e0ad31665d280443e8b0a8eb00..b635c5737e0c535426109290d8e6d90dcf9265ab 100644 (file)
@@ -8,8 +8,9 @@
 
 #include "pinctrl-mcp23s08.h"
 
-static int mcp230xx_probe(struct i2c_client *client, const struct i2c_device_id *id)
+static int mcp230xx_probe(struct i2c_client *client)
 {
+       const struct i2c_device_id *id = i2c_client_get_device_id(client);
        struct device *dev = &client->dev;
        unsigned int type = id->driver_data;
        struct mcp23s08 *mcp;
@@ -100,7 +101,7 @@ static struct i2c_driver mcp230xx_driver = {
                .name   = "mcp230xx",
                .of_match_table = mcp23s08_i2c_of_match,
        },
-       .probe          = mcp230xx_probe,
+       .probe_new      = mcp230xx_probe,
        .id_table       = mcp230xx_id,
 };