Skip to content

Commit 8ff48be

Browse files
Uwe Kleine-Königdtor
authored andcommitted
Input: st1232 - 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 <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Dmitry Torokhov <[email protected]>
1 parent 6440fab commit 8ff48be

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

drivers/input/touchscreen/st1232.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -220,9 +220,9 @@ static const struct st_chip_info st1633_chip_info = {
220220
.max_fingers = 5,
221221
};
222222

223-
static int st1232_ts_probe(struct i2c_client *client,
224-
const struct i2c_device_id *id)
223+
static int st1232_ts_probe(struct i2c_client *client)
225224
{
225+
const struct i2c_device_id *id = i2c_client_get_device_id(client);
226226
const struct st_chip_info *match;
227227
struct st1232_ts_data *ts;
228228
struct input_dev *input_dev;
@@ -384,7 +384,7 @@ static const struct of_device_id st1232_ts_dt_ids[] = {
384384
MODULE_DEVICE_TABLE(of, st1232_ts_dt_ids);
385385

386386
static struct i2c_driver st1232_ts_driver = {
387-
.probe = st1232_ts_probe,
387+
.probe_new = st1232_ts_probe,
388388
.id_table = st1232_ts_id,
389389
.driver = {
390390
.name = ST1232_TS_NAME,

0 commit comments

Comments
 (0)