spi: sc18is602: Convert to i2c's .probe_new()
authorUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Fri, 18 Nov 2022 22:44:58 +0000 (23:44 +0100)
committerMark Brown <broonie@kernel.org>
Wed, 23 Nov 2022 17:26:25 +0000 (17:26 +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-565-uwe@kleine-koenig.org
Signed-off-by: Mark Brown <broonie@kernel.org>
drivers/spi/spi-sc18is602.c

index 5d27ee4..983b362 100644 (file)
@@ -235,9 +235,9 @@ static int sc18is602_setup(struct spi_device *spi)
        return 0;
 }
 
-static int sc18is602_probe(struct i2c_client *client,
-                          const struct i2c_device_id *id)
+static int sc18is602_probe(struct i2c_client *client)
 {
+       const struct i2c_device_id *id = i2c_client_get_device_id(client);
        struct device *dev = &client->dev;
        struct device_node *np = dev->of_node;
        struct sc18is602_platform_data *pdata = dev_get_platdata(dev);
@@ -337,7 +337,7 @@ static struct i2c_driver sc18is602_driver = {
                .name = "sc18is602",
                .of_match_table = of_match_ptr(sc18is602_of_match),
        },
-       .probe = sc18is602_probe,
+       .probe_new = sc18is602_probe,
        .id_table = sc18is602_id,
 };