Input: sis_i2c - Convert to i2c's .probe_new()

Uwe Kleine-König · dtor · commit 6440fab21644 · 2022-12-02T14:53:47.000-08:00
The probe function doesn't make use of the i2c_device_id * parameter so it can be trivially converted. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Link: https://lore.kernel.org/r/20221118224540.619276-259-uwe@kleine-koenig.org Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
diff --git a/drivers/input/touchscreen/sis_i2c.c b/drivers/input/touchscreen/sis_i2c.c
@@ -296,8 +296,7 @@ static void sis_ts_reset(struct sis_ts_data *ts)
 	}
 }
 
-static int sis_ts_probe(struct i2c_client *client,
-			const struct i2c_device_id *id)
+static int sis_ts_probe(struct i2c_client *client)
 {
 	struct sis_ts_data *ts;
 	struct input_dev *input;
@@ -394,7 +393,7 @@ static struct i2c_driver sis_ts_driver = {
 		.name	= SIS_I2C_NAME,
 		.of_match_table = of_match_ptr(sis_ts_dt_ids),
 	},
-	.probe		= sis_ts_probe,
+	.probe_new	= sis_ts_probe,
 	.id_table	= sis_ts_id,
 };
 module_i2c_driver(sis_ts_driver);

Original file line number	Diff line number	Diff line change
`@@ -296,8 +296,7 @@ static void sis_ts_reset(struct sis_ts_data *ts)`
`296`	`296`	`}`
`297`	`297`	`}`
`298`	`298`
`299`		`-static int sis_ts_probe(struct i2c_client *client,`
`300`		`- const struct i2c_device_id *id)`
	`299`	`+static int sis_ts_probe(struct i2c_client *client)`
`301`	`300`	`{`
`302`	`301`	`struct sis_ts_data *ts;`
`303`	`302`	`struct input_dev *input;`
`@@ -394,7 +393,7 @@ static struct i2c_driver sis_ts_driver = {`
`394`	`393`	`.name = SIS_I2C_NAME,`
`395`	`394`	`.of_match_table = of_match_ptr(sis_ts_dt_ids),`
`396`	`395`	`},`
`397`		`- .probe = sis_ts_probe,`
	`396`	`+ .probe_new = sis_ts_probe,`
`398`	`397`	`.id_table = sis_ts_id,`
`399`	`398`	`};`
`400`	`399`	`module_i2c_driver(sis_ts_driver);`