Input: wdt87xx_i2c - a couple of cleanups
Subsystems (2)
v2 cover Input: wdt87xx_i2c - a couple of cleanups
A couple of cleanups related to ACPI ID table and probe function.
Changelog v2:
- dropped no-op message for ENOMEM, dropped dup message for request IRQ failure
v1: [email protected]`
Andy Shevchenko (2):
Input: wdt87xx_i2c - tidy up ACPI ID table
Input: wdt87xx_i2c - switch to use dev_err_probe()
drivers/input/touchscreen/wdt87xx_i2c.c | 45 +++++++++++-------------- 1 file changed, 20 insertions(+), 25 deletions(-)
Signature · 1 line
2.50.1
PATCH v2 1/2 Input: wdt87xx_i2c - tidy up ACPI ID table
Tidy up ACPI ID table:
- drop ACPI_PTR() and hence replace acpi.h with mod_devicetable.h et al.
- remove explicit driver_data initializer
--- drivers/input/touchscreen/wdt87xx_i2c.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-)
drivers/input/touchscreen/wdt87xx_i2c.c +13 -8
@@ -9,17 +9,24 @@* may be copied, distributed, and modified under those terms. */ +#include <linux/array_size.h> +#include <linux/delay.h> +#include <linux/device.h> +#include <linux/firmware.h> #include <linux/i2c.h> #include <linux/input.h> +#include <linux/input/mt.h> #include <linux/interrupt.h> -#include <linux/delay.h> #include <linux/irq.h> #include <linux/io.h> +#include <linux/math.h> +#include <linux/mod_devicetable.h> #include <linux/module.h> +#include <linux/mutex.h> +#include <linux/pm.h> #include <linux/slab.h> -#include <linux/firmware.h> -#include <linux/input/mt.h> -#include <linux/acpi.h> +#include <linux/sysfs.h> +#include <linux/types.h> #include <linux/unaligned.h> #define WDT87XX_NAME "wdt87xx_i2c"
@@ -1153,13 +1160,11 @@ static const struct i2c_device_id wdt87xx_dev_id[] = { };MODULE_DEVICE_TABLE (i2c, wdt87xx_dev_id); -#ifdef CONFIG_ACPI static const struct acpi_device_id wdt87xx_acpi_id[] = { - {"WDHT0001" ,0 }, + {"WDHT0001" }, { } };MODULE_DEVICE_TABLE (acpi, wdt87xx_acpi_id); -#endif static struct i2c_driver wdt87xx_driver = { .probe = wdt87xx_ts_probe,
@@ -1168,7 +1173,7 @@ static struct i2c_driver wdt87xx_driver = { .name = WDT87XX_NAME, .dev_groups = wdt87xx_groups, .pm = pm_sleep_ptr(&wdt87xx_pm_ops), - .acpi_match_table = ACPI_PTR(wdt87xx_acpi_id), + .acpi_match_table = wdt87xx_acpi_id, }, };module_i2c_driver (wdt87xx_driver);
Signature · 1 line
2.50.1
Dmitry Torokhov
maintainerRe: [PATCH v2 1/2] Input: wdt87xx_i2c - tidy up ACPI ID table
Hi Andy,
Quoted 3 lines · Andy Shevchenko
Tidy up ACPI ID table:
- dropACPI_PTR()and hence replaceacpi.hwithmod_devicetable.het al.
- remove explicitdriver_datainitializer
With the exception of cleaning the driver_data is it unclear to me what the benefit is. The driver is potentially useful on non-ACPI systems (or may be easily adopted) so making ACPI not optional does not sound like improvement...
Thanks.
Signature · 1 line
Dmitry
Re: [PATCH v2 1/2] Input: wdt87xx_i2c - tidy up ACPI ID table
Quoted 10 lines · Dmitry Torokhov
Quoted 3 lines · Andy Shevchenko
Tidy up ACPI ID table:
- dropACPI_PTR()and hence replaceacpi.hwithmod_devicetable.het al.
- remove explicitdriver_datainitializerWith the exception of cleaning the
driver_datais it unclear to me what the benefit is. The driver is potentially useful on non-ACPI systems (or may be easily adopted) so making ACPI not optional does not sound like improvement...
I'm not sure how you came to the conclusion "making ACPI not optional". This is just matter of dozens of bytes in the binary, it doesn't affect functionality neither on ACPI-based, nor on non-ACPI platforms.
Signature · 2 lines
With Best Regards, Andy Shevchenko
PATCH v2 2/2 Input: wdt87xx_i2c - switch to use dev_err_probe()
In reply to Andy ShevchenkoSwitch to use dev_err_probe() to simplify the error path and unify a message template. With that being done, drop the now no-op message for -ENOMEM as allocator will print a big warning anyway and remove duplicate message for devm_request_threaded_irq().
--- drivers/input/touchscreen/wdt87xx_i2c.c | 24 +++++++----------------- 1 file changed, 7 insertions(+), 17 deletions(-)
drivers/input/touchscreen/wdt87xx_i2c.c +7 -17
@@ -1033,10 +1033,8 @@ static int wdt87xx_ts_create_input_device(struct wdt87xx_data *wdt)int error; input =devm_input_allocate_device (dev); -if (!input) { -dev_err (dev,"failed to allocate input device\n" ); +if (!input)return -ENOMEM ; - } wdt->input = input; input->name ="WDT87xx Touchscreen" ;
@@ -1060,16 +1058,15 @@ static int wdt87xx_ts_create_input_device(struct wdt87xx_data *wdt) INPUT_MT_DIRECT | INPUT_MT_DROP_UNUSED); error =input_register_device (input); -if (error) { -dev_err (dev,"failed to register input device: %d\n" , error); -return error; - } +if (error) +return dev_err_probe (dev, error,"failed to register input device\n" );return 0 ; }static int wdt87xx_ts_probe (struct i2c_client *client) { +struct device *dev = &client->dev;struct wdt87xx_data *wdt;int error;
@@ -1099,16 +1096,9 @@ static int wdt87xx_ts_probe(struct i2c_client *client)if (error)return error; - error =devm_request_threaded_irq (&client->dev, client->irq, -NULL , wdt87xx_ts_interrupt, -IRQF_ONESHOT , - client->name, wdt); -if (error) { -dev_err (&client->dev,"request irq failed: %d\n" , error); -return error; - } - -return 0 ; +return devm_request_threaded_irq (dev, client->irq, +NULL , wdt87xx_ts_interrupt, +IRQF_ONESHOT , client->name, wdt); }static int wdt87xx_suspend (struct device *dev)
Signature · 1 line
2.50.1
Dmitry Torokhov
maintainerRe: [PATCH v2 2/2] Input: wdt87xx_i2c - switch to use dev_err_probe()
Hi Andy,
Quoted 33 lines · Andy Shevchenko
Switch to use
dev_err_probe()to simplify the error path and unify a message template. With that being done, drop the now no-op message for-ENOMEMas allocator will print a big warning anyway and remove duplicate message fordevm_request_threaded_irq().Signed-off-by Andy Shevchenko <[email protected]>--- drivers/input/touchscreen/wdt87xx_i2c.c | 24 +++++++----------------- 1 file changed, 7 insertions(+), 17 deletions(-)drivers/input/touchscreen/wdt87xx_i2c.c +1
-6@@ -1033,10 +1033,8 @@ static int wdt87xx_ts_create_input_device(struct wdt87xx_data *wdt)int error; input =devm_input_allocate_device (dev); -if (!input) { -dev_err (dev,"failed to allocate input device\n" ); +if (!input)return -ENOMEM ; - } wdt->input = input; input->name ="WDT87xx Touchscreen" ;@@ -1060,16 +1058,15 @@ static int wdt87xx_ts_create_input_device(struct wdt87xx_data *wdt) INPUT_MT_DIRECT | INPUT_MT_DROP_UNUSED); error =input_register_device (input); -if (error) { -dev_err (dev,"failed to register input device: %d\n" , error); -return error;
drivers/input/touchscreen/wdt87xx_i2c.c static int wdt87xx_ts_create_input_device(struct wdt87xx_data *wdt) · line 1069
Quoted 10 lines
drivers/input/touchscreen/wdt87xx_i2c.c +3
-1- } +if (error) +return dev_err_probe (dev, error,"failed to register input device\n" );return 0 ; }static int wdt87xx_ts_probe (struct i2c_client *client) { +struct device *dev = &client->dev;
You introduced a tempo but used it in only one place. I dropped it.
Quoted 10 lines
drivers/input/touchscreen/wdt87xx_i2c.c +0
-3struct wdt87xx_data *wdt;int error;@@ -1099,16 +1096,9 @@ static int wdt87xx_ts_probe(struct i2c_client *client)if (error)return error; - error = devm_request_threaded_irq(&client->dev, client->irq, - NULL, wdt87xx_ts_interrupt, - IRQF_ONESHOT,
drivers/input/touchscreen/wdt87xx_i2c.c static int wdt87xx_ts_probe(struct i2c_client *client) · line 1101
Quoted 10 lines
drivers/input/touchscreen/wdt87xx_i2c.c +3
-7- client->name, wdt); -if (error) { -dev_err (&client->dev,"request irq failed: %d\n" , error); -return error; - } - -return 0 ; +return devm_request_threaded_irq (dev, client->irq, +NULL , wdt87xx_ts_interrupt, +IRQF_ONESHOT , client->name, wdt);
My preference is to keep "if (error) return error;" even for the last call when there are multiple potential points of failure in the function, adjusted.
Applied the updated patch.
Thanks.
Signature · 1 line
Dmitry
Re: [PATCH v2 2/2] Input: wdt87xx_i2c - switch to use dev_err_probe()
Quoted 1 line · Dmitry Torokhov
On Tue, Jan 13, 2026 at 09:22:58AM +0100, Andy Shevchenko wrote:
...
Quoted 3 lines
drivers/input/touchscreen/wdt87xx_i2c.c static int wdt87xx_ts_create_input_device(struct wdt87xx_data *wdt) · line 1069
Quoted 1 line
drivers/input/touchscreen/wdt87xx_i2c.c +1
-0+struct device *dev = &client->dev;You introduced a tempo but used it in only one place. I dropped it.
Yes, to avoid churn on converting unrelated places right now. But it may help in the future.
...
Quoted 9 lines
Quoted 9 lines
drivers/input/touchscreen/wdt87xx_i2c.c +0
-9- error =devm_request_threaded_irq (&client->dev, client->irq, -NULL , wdt87xx_ts_interrupt, -IRQF_ONESHOT , - client->name, wdt); -if (error) { -dev_err (&client->dev,"request irq failed: %d\n" , error); -return error; - } -
Quoted 8 lines
drivers/input/touchscreen/wdt87xx_i2c.c static int wdt87xx_ts_probe(struct i2c_client *client) · line 1101
Quoted 4 lines
drivers/input/touchscreen/wdt87xx_i2c.c +3
-1-return 0 ; +return devm_request_threaded_irq (dev, client->irq, +NULL , wdt87xx_ts_interrupt, +IRQF_ONESHOT , client->name, wdt);My preference is to keep "if (error) return error;" even for the last call when there are multiple potential points of failure in the function, adjusted.
Okay, no problem.
Quoted 1 line
Applied the updated patch.
Thanks!
Signature · 2 lines
With Best Regards, Andy Shevchenko