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/tsc2004.c | |
| parent | 8c9a59939deb4bfafdc451100c03d1e848b4169b (diff) | |
| parent | c3991107a28a5ad0bd90660ca3bbf8c2c220ea98 (diff) | |
| download | linux-next-e291c116f60f3c1ca98090f0f8e7c77e658562fb.tar.gz linux-next-e291c116f60f3c1ca98090f0f8e7c77e658562fb.zip | |
Merge branch 'next' into for-linus
Prepare input updates for 6.2 merge window.
Diffstat (limited to 'drivers/input/touchscreen/tsc2004.c')
| -rw-r--r-- | drivers/input/touchscreen/tsc2004.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/input/touchscreen/tsc2004.c b/drivers/input/touchscreen/tsc2004.c index a9565353ee98..575768b587bb 100644 --- a/drivers/input/touchscreen/tsc2004.c +++ b/drivers/input/touchscreen/tsc2004.c @@ -34,8 +34,7 @@ static int tsc2004_cmd(struct device *dev, u8 cmd) return 0; } -static int tsc2004_probe(struct i2c_client *i2c, - const struct i2c_device_id *id) +static int tsc2004_probe(struct i2c_client *i2c) { return tsc200x_probe(&i2c->dev, i2c->irq, &tsc2004_input_id, @@ -69,7 +68,7 @@ static struct i2c_driver tsc2004_driver = { .pm = &tsc200x_pm_ops, }, .id_table = tsc2004_idtable, - .probe = tsc2004_probe, + .probe_new = tsc2004_probe, .remove = tsc2004_remove, }; module_i2c_driver(tsc2004_driver); |