* [resend, PATCH v1 0/2] Input: wdt87xx_i2c - a couple of cleanups
@ 2026-01-13 7:35 Andy Shevchenko
2026-01-13 7:35 ` [PATCH v1 1/2] Input: wdt87xx_i2c - tidy up ACPI ID table Andy Shevchenko
2026-01-13 7:35 ` [PATCH v1 2/2] Input: wdt87xx_i2c - switch to use dev_err_probe() Andy Shevchenko
0 siblings, 2 replies; 5+ messages in thread
From: Andy Shevchenko @ 2026-01-13 7:35 UTC (permalink / raw)
To: Andy Shevchenko, linux-input, linux-kernel; +Cc: Dmitry Torokhov
A couple of cleanups related to ACPI ID table and probe function.
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 | 40 ++++++++++++-------------
1 file changed, 20 insertions(+), 20 deletions(-)
--
2.50.1
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH v1 1/2] Input: wdt87xx_i2c - tidy up ACPI ID table
2026-01-13 7:35 [resend, PATCH v1 0/2] Input: wdt87xx_i2c - a couple of cleanups Andy Shevchenko
@ 2026-01-13 7:35 ` Andy Shevchenko
2026-01-13 7:35 ` [PATCH v1 2/2] Input: wdt87xx_i2c - switch to use dev_err_probe() Andy Shevchenko
1 sibling, 0 replies; 5+ messages in thread
From: Andy Shevchenko @ 2026-01-13 7:35 UTC (permalink / raw)
To: Andy Shevchenko, linux-input, linux-kernel; +Cc: Dmitry Torokhov
Tidy up ACPI ID table:
- drop ACPI_PTR() and hence replace acpi.h with mod_devicetable.h et al.
- remove explicit driver_data initializer
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
drivers/input/touchscreen/wdt87xx_i2c.c | 21 +++++++++++++--------
1 file changed, 13 insertions(+), 8 deletions(-)
diff --git a/drivers/input/touchscreen/wdt87xx_i2c.c b/drivers/input/touchscreen/wdt87xx_i2c.c
index 88d376090e6e..99636d6eb0f3 100644
--- a/drivers/input/touchscreen/wdt87xx_i2c.c
+++ b/drivers/input/touchscreen/wdt87xx_i2c.c
@@ -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);
--
2.50.1
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH v1 2/2] Input: wdt87xx_i2c - switch to use dev_err_probe()
2026-01-13 7:35 [resend, PATCH v1 0/2] Input: wdt87xx_i2c - a couple of cleanups Andy Shevchenko
2026-01-13 7:35 ` [PATCH v1 1/2] Input: wdt87xx_i2c - tidy up ACPI ID table Andy Shevchenko
@ 2026-01-13 7:35 ` Andy Shevchenko
2026-01-13 7:57 ` Andy Shevchenko
1 sibling, 1 reply; 5+ messages in thread
From: Andy Shevchenko @ 2026-01-13 7:35 UTC (permalink / raw)
To: Andy Shevchenko, linux-input, linux-kernel; +Cc: Dmitry Torokhov
Switch to use dev_err_probe() to simplify the error path and
unify a message template.
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
drivers/input/touchscreen/wdt87xx_i2c.c | 19 +++++++------------
1 file changed, 7 insertions(+), 12 deletions(-)
diff --git a/drivers/input/touchscreen/wdt87xx_i2c.c b/drivers/input/touchscreen/wdt87xx_i2c.c
index 99636d6eb0f3..3e7fbc4d7549 100644
--- a/drivers/input/touchscreen/wdt87xx_i2c.c
+++ b/drivers/input/touchscreen/wdt87xx_i2c.c
@@ -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");
- return -ENOMEM;
- }
+ if (!input)
+ return dev_err_probe(dev, -ENOMEM, "failed to allocate input device\n");
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;
@@ -1103,10 +1100,8 @@ static int wdt87xx_ts_probe(struct i2c_client *client)
NULL, wdt87xx_ts_interrupt,
IRQF_ONESHOT,
client->name, wdt);
- if (error) {
- dev_err(&client->dev, "request irq failed: %d\n", error);
- return error;
- }
+ if (error)
+ return dev_err_probe(dev, error, "request irq failed\n");
return 0;
}
--
2.50.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH v1 0/2] Input: wdt87xx_i2c - a couple of cleanups
@ 2025-03-21 18:39 Andy Shevchenko
2025-03-21 18:39 ` [PATCH v1 1/2] Input: wdt87xx_i2c - tidy up ACPI ID table Andy Shevchenko
0 siblings, 1 reply; 5+ messages in thread
From: Andy Shevchenko @ 2025-03-21 18:39 UTC (permalink / raw)
To: Andy Shevchenko, linux-input, linux-kernel; +Cc: Dmitry Torokhov
A couple of cleanups related to ACPI ID table and probe function.
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 | 40 ++++++++++++-------------
1 file changed, 20 insertions(+), 20 deletions(-)
--
2.47.2
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH v1 1/2] Input: wdt87xx_i2c - tidy up ACPI ID table
2025-03-21 18:39 [PATCH v1 0/2] Input: wdt87xx_i2c - a couple of cleanups Andy Shevchenko
@ 2025-03-21 18:39 ` Andy Shevchenko
0 siblings, 0 replies; 5+ messages in thread
From: Andy Shevchenko @ 2025-03-21 18:39 UTC (permalink / raw)
To: Andy Shevchenko, linux-input, linux-kernel; +Cc: Dmitry Torokhov
Tidy up ACPI ID table:
- drop ACPI_PTR() and hence replace acpi.h with mod_devicetable.h et al.
- remove explicit driver_data initializer
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
drivers/input/touchscreen/wdt87xx_i2c.c | 21 +++++++++++++--------
1 file changed, 13 insertions(+), 8 deletions(-)
diff --git a/drivers/input/touchscreen/wdt87xx_i2c.c b/drivers/input/touchscreen/wdt87xx_i2c.c
index 88d376090e6e..99636d6eb0f3 100644
--- a/drivers/input/touchscreen/wdt87xx_i2c.c
+++ b/drivers/input/touchscreen/wdt87xx_i2c.c
@@ -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);
--
2.47.2
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2026-01-13 7:57 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-01-13 7:35 [resend, PATCH v1 0/2] Input: wdt87xx_i2c - a couple of cleanups Andy Shevchenko
2026-01-13 7:35 ` [PATCH v1 1/2] Input: wdt87xx_i2c - tidy up ACPI ID table Andy Shevchenko
2026-01-13 7:35 ` [PATCH v1 2/2] Input: wdt87xx_i2c - switch to use dev_err_probe() Andy Shevchenko
2026-01-13 7:57 ` Andy Shevchenko
-- strict thread matches above, loose matches on Subject: below --
2025-03-21 18:39 [PATCH v1 0/2] Input: wdt87xx_i2c - a couple of cleanups Andy Shevchenko
2025-03-21 18:39 ` [PATCH v1 1/2] Input: wdt87xx_i2c - tidy up ACPI ID table Andy Shevchenko
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.