From: Uwe Kleine-König Date: Fri, 18 Nov 2022 22:38:48 +0000 (+0100) Subject: Input: cap11xx - Convert to i2c's .probe_new() X-Git-Tag: v6.2-rc1~116^2^2~108 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=15214ab26928a780f20bfc18a19ee7b93c630229;p=thirdparty%2Fkernel%2Flinux.git Input: cap11xx - Convert to i2c's .probe_new() .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 Link: https://lore.kernel.org/r/20221118224540.619276-195-uwe@kleine-koenig.org Signed-off-by: Dmitry Torokhov --- diff --git a/drivers/input/keyboard/cap11xx.c b/drivers/input/keyboard/cap11xx.c index 7c85343cd32f9..79afd0386e3ff 100644 --- a/drivers/input/keyboard/cap11xx.c +++ b/drivers/input/keyboard/cap11xx.c @@ -321,9 +321,9 @@ static int cap11xx_init_leds(struct device *dev, } #endif -static int cap11xx_i2c_probe(struct i2c_client *i2c_client, - const struct i2c_device_id *id) +static int cap11xx_i2c_probe(struct i2c_client *i2c_client) { + const struct i2c_device_id *id = i2c_client_get_device_id(i2c_client); struct device *dev = &i2c_client->dev; struct cap11xx_priv *priv; struct device_node *node; @@ -503,7 +503,7 @@ static struct i2c_driver cap11xx_i2c_driver = { .of_match_table = cap11xx_dt_ids, }, .id_table = cap11xx_i2c_ids, - .probe = cap11xx_i2c_probe, + .probe_new = cap11xx_i2c_probe, }; module_i2c_driver(cap11xx_i2c_driver);