Linux Input/HID development
 help / color / mirror / Atom feed
* [PATCH] Input: exc3000 - remove use of i2c_match_id()
@ 2026-11-18 16:18 Andrew Davis
  0 siblings, 0 replies; only message in thread
From: Andrew Davis @ 2026-11-18 16:18 UTC (permalink / raw)
  To: Dmitry Torokhov; +Cc: linux-input, linux-kernel, Andrew Davis

The function i2c_match_id() is used to fetch the matching ID from
the i2c_device_id table. This is often used to then retrieve the
matching driver_data. This can be done in one step with the helper
i2c_get_match_data().

Signed-off-by: Andrew Davis <afd@ti.com>
---
 drivers/input/touchscreen/exc3000.c | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/drivers/input/touchscreen/exc3000.c b/drivers/input/touchscreen/exc3000.c
index d6e0c5183a483..f8f865cd4a9be 100644
--- a/drivers/input/touchscreen/exc3000.c
+++ b/drivers/input/touchscreen/exc3000.c
@@ -42,8 +42,6 @@
 #define EXC3000_RESET_MS		10
 #define EXC3000_READY_MS		100
 
-static const struct i2c_device_id exc3000_id[];
-
 struct eeti_dev_info {
 	const char *name;
 	int max_xy;
@@ -338,12 +336,7 @@ static int exc3000_probe(struct i2c_client *client)
 		return -ENOMEM;
 
 	data->client = client;
-	data->info = device_get_match_data(&client->dev);
-	if (!data->info) {
-		enum eeti_dev_id eeti_dev_id =
-			i2c_match_id(exc3000_id, client)->driver_data;
-		data->info = &exc3000_info[eeti_dev_id];
-	}
+	data->info = i2c_get_match_data(client);
 	timer_setup(&data->timer, exc3000_timer, 0);
 	init_completion(&data->wait_event);
 	mutex_init(&data->query_lock);
@@ -432,10 +425,10 @@ static int exc3000_probe(struct i2c_client *client)
 }
 
 static const struct i2c_device_id exc3000_id[] = {
-	{ .name = "exc3000", .driver_data = EETI_EXC3000 },
-	{ .name = "exc80h60", .driver_data = EETI_EXC80H60 },
-	{ .name = "exc80h84", .driver_data = EETI_EXC80H84 },
-	{ .name = "exc81w32", .driver_data = EETI_EXC81W32 },
+	{ .name = "exc3000", .driver_data = (kernel_ulong_t)&exc3000_info[EETI_EXC3000] },
+	{ .name = "exc80h60", .driver_data = (kernel_ulong_t)&exc3000_info[EETI_EXC80H60] },
+	{ .name = "exc80h84", .driver_data = (kernel_ulong_t)&exc3000_info[EETI_EXC80H84] },
+	{ .name = "exc81w32", .driver_data = (kernel_ulong_t)&exc3000_info[EETI_EXC81W32] },
 	{ }
 };
 MODULE_DEVICE_TABLE(i2c, exc3000_id);
-- 
2.43.0


^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2026-11-18 16:19 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-11-18 16:18 [PATCH] Input: exc3000 - remove use of i2c_match_id() Andrew Davis

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox