diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2022-12-12 10:47:03 -0800 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2022-12-12 10:47:03 -0800 |
| commit | e291c116f60f3c1ca98090f0f8e7c77e658562fb (patch) | |
| tree | 2fbe810f2a6f8b29f1cdaefd87b24debbfa0ec07 /drivers/input/touchscreen/ad7879-i2c.c | |
| parent | 8c9a59939deb4bfafdc451100c03d1e848b4169b (diff) | |
| parent | c3991107a28a5ad0bd90660ca3bbf8c2c220ea98 (diff) | |
Merge branch 'next' into for-linus
Prepare input updates for 6.2 merge window.
Diffstat (limited to 'drivers/input/touchscreen/ad7879-i2c.c')
| -rw-r--r-- | drivers/input/touchscreen/ad7879-i2c.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/input/touchscreen/ad7879-i2c.c b/drivers/input/touchscreen/ad7879-i2c.c index 0f20a1fdcdba..dd8f31737bb8 100644 --- a/drivers/input/touchscreen/ad7879-i2c.c +++ b/drivers/input/touchscreen/ad7879-i2c.c @@ -23,8 +23,7 @@ static const struct regmap_config ad7879_i2c_regmap_config = { .max_register = 15, }; -static int ad7879_i2c_probe(struct i2c_client *client, - const struct i2c_device_id *id) +static int ad7879_i2c_probe(struct i2c_client *client) { struct regmap *regmap; @@ -63,7 +62,7 @@ static struct i2c_driver ad7879_i2c_driver = { .pm = &ad7879_pm_ops, .of_match_table = of_match_ptr(ad7879_i2c_dt_ids), }, - .probe = ad7879_i2c_probe, + .probe_new = ad7879_i2c_probe, .id_table = ad7879_id, }; |