diff options
| author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2022-11-18 23:38:48 +0100 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2022-12-02 14:53:41 -0800 |
| commit | 15214ab26928a780f20bfc18a19ee7b93c630229 (patch) | |
| tree | 612dc7e647f0c7a2420b15ddf2368aee041e8a0a /drivers/input/keyboard/cap11xx.c | |
| parent | 5a5fa6583e856e134d3a27db5b4c90020c3bfc9a (diff) | |
| download | lwn-15214ab26928a780f20bfc18a19ee7b93c630229.tar.gz lwn-15214ab26928a780f20bfc18a19ee7b93c630229.zip | |
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 <u.kleine-koenig@pengutronix.de>
Link: https://lore.kernel.org/r/20221118224540.619276-195-uwe@kleine-koenig.org
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Diffstat (limited to 'drivers/input/keyboard/cap11xx.c')
| -rw-r--r-- | drivers/input/keyboard/cap11xx.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/input/keyboard/cap11xx.c b/drivers/input/keyboard/cap11xx.c index 7c85343cd32f..79afd0386e3f 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); |