leds: pca9532: Convert to i2c's .probe_new()
authorUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Fri, 18 Nov 2022 22:40:18 +0000 (23:40 +0100)
committerLee Jones <lee@kernel.org>
Mon, 30 Jan 2023 08:03:30 +0000 (08:03 +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>
Signed-off-by: Lee Jones <lee@kernel.org>
Link: https://lore.kernel.org/r/20221118224540.619276-285-uwe@kleine-koenig.org
drivers/leds/leds-pca9532.c

index df83d97..15b1acf 100644 (file)
@@ -50,8 +50,7 @@ struct pca9532_data {
        u8 psc[2];
 };
 
-static int pca9532_probe(struct i2c_client *client,
-       const struct i2c_device_id *id);
+static int pca9532_probe(struct i2c_client *client);
 static void pca9532_remove(struct i2c_client *client);
 
 enum {
@@ -103,7 +102,7 @@ static struct i2c_driver pca9532_driver = {
                .name = "leds-pca953x",
                .of_match_table = of_match_ptr(of_pca9532_leds_match),
        },
-       .probe = pca9532_probe,
+       .probe_new = pca9532_probe,
        .remove = pca9532_remove,
        .id_table = pca9532_id,
 };
@@ -504,9 +503,9 @@ pca9532_of_populate_pdata(struct device *dev, struct device_node *np)
        return pdata;
 }
 
-static int pca9532_probe(struct i2c_client *client,
-       const struct i2c_device_id *id)
+static int pca9532_probe(struct i2c_client *client)
 {
+       const struct i2c_device_id *id = i2c_client_get_device_id(client);
        int devid;
        struct pca9532_data *data = i2c_get_clientdata(client);
        struct pca9532_platform_data *pca9532_pdata =