From 2c6aaf88a265c44d094ab1edd07d2f6b003f5d1b Mon Sep 17 00:00:00 2001 From: =?utf8?q?Uwe=20Kleine-K=C3=B6nig?= Date: Fri, 18 Nov 2022 23:40:19 +0100 Subject: [PATCH] leds: pca963x: Convert to i2c's .probe_new() MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit .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 Signed-off-by: Lee Jones Link: https://lore.kernel.org/r/20221118224540.619276-286-uwe@kleine-koenig.org --- drivers/leds/leds-pca963x.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/leds/leds-pca963x.c b/drivers/leds/leds-pca963x.c index a7e052c..9cd476d 100644 --- a/drivers/leds/leds-pca963x.c +++ b/drivers/leds/leds-pca963x.c @@ -389,9 +389,9 @@ static const struct of_device_id of_pca963x_match[] = { }; MODULE_DEVICE_TABLE(of, of_pca963x_match); -static int pca963x_probe(struct i2c_client *client, - const struct i2c_device_id *id) +static int pca963x_probe(struct i2c_client *client) { + const struct i2c_device_id *id = i2c_client_get_device_id(client); struct device *dev = &client->dev; struct pca963x_chipdef *chipdef; struct pca963x *chip; @@ -431,7 +431,7 @@ static struct i2c_driver pca963x_driver = { .name = "leds-pca963x", .of_match_table = of_pca963x_match, }, - .probe = pca963x_probe, + .probe_new = pca963x_probe, .id_table = pca963x_id, }; -- 2.7.4