LKML: Andy Shevchenko: [PATCH v1 1/2] Input: wdt87xx_i2c

<?xml version="1.0" encoding="UTF-8" standalone="yes"?> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>LKML: Andy Shevchenko: [PATCH v1 1/2] Input: wdt87xx_i2c - tidy up ACPI ID table</title><link href="/css/message.css" rel="stylesheet" type="text/css" /><link href="/css/wrap.css" rel="alternate stylesheet" type="text/css" title="wrap" /><link href="/css/nowrap.css" rel="stylesheet" type="text/css" title="nowrap" /><link href="/favicon.ico" rel="shortcut icon" /><script src="/js/simple-calendar.js" type="text/javascript"></script><script src="/js/styleswitcher.js" type="text/javascript"></script><link rel="alternate" type="application/rss+xml" title="lkml.org : last 100 messages" href="/rss.php" /><link rel="alternate" type="application/rss+xml" title="lkml.org : last messages by Andy Shevchenko" href="/groupie.php?aid=" /><script> var _paq = window._paq = window._paq || []; /* tracker methods like "setCustomDimension" should be called before "trackPageView" */ _paq.push(["setDoNotTrack", true]); _paq.push(["disableCookies"]); _paq.push(['trackPageView']); _paq.push(['enableLinkTracking']); (function() { var u="//m.lkml.org/"; _paq.push(['setTrackerUrl', u+'matomo.php']); _paq.push(['setSiteId', '1']); var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0]; g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s); })(); </script></head><body onload="es.jasper.simpleCalendar.init();" itemscope="itemscope" itemtype="http://schema.org/BlogPosting"><table border="0" cellpadding="0" cellspacing="0"><tr><td width="180" align="center"><a href="/"><img style="border:0;width:135px;height:32px" src="/images/toprowlk.gif" alt="lkml.org" /></a></td><td width="32">聽</td><td class="nb"><div><a class="nb" href="/lkml"> [lkml]</a> 聽 <a class="nb" href="/lkml/2025"> [2025]</a> 聽 <a class="nb" href="/lkml/2025/3"> [Mar]</a> 聽 <a class="nb" href="/lkml/2025/3/21"> [21]</a> 聽 <a class="nb" href="/lkml/last100"> [last100]</a> 聽 <a href="/rss.php"><img src="/images/rss-or.gif" border="0" alt="RSS Feed" /></a></div><div>Views: <a href="#" class="nowrap" onclick="setActiveStyleSheet('wrap');return false;">[wrap]</a><a href="#" class="wrap" onclick="setActiveStyleSheet('nowrap');return false;">[no wrap]</a> 聽 <a class="nb" href="/lkml/mheaders/2025/3/21/1237" onclick="this.href='/lkml/headers'+'/2025/3/21/1237';">[headers]</a>聽 <a href="/lkml/bounce/2025/3/21/1237">[forward]</a>聽 </div></td><td width="32">聽</td></tr><tr><td valign="top"><div class="es-jasper-simpleCalendar" baseurl="/lkml/"></div><div class="threadlist">Messages in this thread</div><ul class="threadlist"><li class="root"><a href="/lkml/2025/3/21/1235">First message in thread</a></li><li><a href="/lkml/2025/3/21/1235">Andy Shevchenko</a><ul><li><a href="/lkml/2025/3/21/1236">Andy Shevchenko</a></li><li class="origin"><a href="">Andy Shevchenko</a></li></ul></li></ul><div class="threadlist">Patch in this message</div><ul class="threadlist"><li><a href="/lkml/diff/2025/3/21/1237/1">Get diff 1</a></li></ul></td><td width="32" rowspan="2" class="c" valign="top"><img src="/images/icornerl.gif" width="32" height="32" alt="/" /></td><td class="c" rowspan="2" valign="top" style="padding-top: 1em"><table><tr><td><table><tr><td class="lp">From</td><td class="rp" itemprop="author">Andy Shevchenko <></td></tr><tr><td class="lp">Subject</td><td class="rp" itemprop="name">[PATCH v1 1/2] Input: wdt87xx_i2c - tidy up ACPI ID table</td></tr><tr><td class="lp">Date</td><td class="rp" itemprop="datePublished">Fri, 21 Mar 2025 20:39:17 +0200</td></tr></table></td><td></td></tr></table><pre itemprop="articleBody">Tidy up ACPI ID table:<br />- drop ACPI_PTR() and hence replace acpi.h with mod_devicetable.h et al.<br />- remove explicit driver_data initializer<br /><br />Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com><br />---<br /> drivers/input/touchscreen/wdt87xx_i2c.c | 21 +++++++++++++--------<br /> 1 file changed, 13 insertions(+), 8 deletions(-)<br /><br />diff --git a/drivers/input/touchscreen/wdt87xx_i2c.c b/drivers/input/touchscreen/wdt87xx_i2c.c<br />index 88d376090e6e..99636d6eb0f3 100644<br />--- a/drivers/input/touchscreen/wdt87xx_i2c.c<br />+++ b/drivers/input/touchscreen/wdt87xx_i2c.c<br />@@ -9,17 +9,24 @@<br /> * may be copied, distributed, and modified under those terms.<br /> */<br /> <br />+#include <linux/array_size.h><br />+#include <linux/delay.h><br />+#include <linux/device.h><br />+#include <linux/firmware.h><br /> #include <linux/i2c.h><br /> #include <linux/input.h><br />+#include <linux/input/mt.h><br /> #include <linux/interrupt.h><br />-#include <linux/delay.h><br /> #include <linux/irq.h><br /> #include <linux/io.h><br />+#include <linux/math.h><br />+#include <linux/mod_devicetable.h><br /> #include <linux/module.h><br />+#include <linux/mutex.h><br />+#include <linux/pm.h><br /> #include <linux/slab.h><br />-#include <linux/firmware.h><br />-#include <linux/input/mt.h><br />-#include <linux/acpi.h><br />+#include <linux/sysfs.h><br />+#include <linux/types.h><br /> #include <linux/unaligned.h><br /> <br /> #define WDT87XX_NAME "wdt87xx_i2c"<br />@@ -1153,13 +1160,11 @@ static const struct i2c_device_id wdt87xx_dev_id[] = {<br /> };<br /> MODULE_DEVICE_TABLE(i2c, wdt87xx_dev_id);<br /> <br />-#ifdef CONFIG_ACPI<br /> static const struct acpi_device_id wdt87xx_acpi_id[] = {<br />- { "WDHT0001", 0 },<br />+ { "WDHT0001" },<br /> { }<br /> };<br /> MODULE_DEVICE_TABLE(acpi, wdt87xx_acpi_id);<br />-#endif<br /> <br /> static struct i2c_driver wdt87xx_driver = {<br /> .probe = wdt87xx_ts_probe,<br />@@ -1168,7 +1173,7 @@ static struct i2c_driver wdt87xx_driver = {<br /> .name = WDT87XX_NAME,<br /> .dev_groups = wdt87xx_groups,<br /> .pm = pm_sleep_ptr(&wdt87xx_pm_ops),<br />- .acpi_match_table = ACPI_PTR(wdt87xx_acpi_id),<br />+ .acpi_match_table = wdt87xx_acpi_id,<br /> },<br /> };<br /> module_i2c_driver(wdt87xx_driver);<br />-- <br />2.47.2<br /><br /></pre></td><td width="32" rowspan="2" class="c" valign="top"><img src="/images/icornerr.gif" width="32" height="32" alt="\" /></td></tr><tr><td align="right" valign="bottom"> 聽 </td></tr><tr><td align="right" valign="bottom">聽</td><td class="c" valign="bottom" style="padding-bottom: 0px"><img src="/images/bcornerl.gif" width="32" height="32" alt="\" /></td><td class="c">聽</td><td class="c" valign="bottom" style="padding-bottom: 0px"><img src="/images/bcornerr.gif" width="32" height="32" alt="/" /></td></tr><tr><td align="right" valign="top" colspan="2"> 聽 </td><td class="lm">Last update: 2025-03-21 19:40 聽聽 [W:0.100 / U:3.860 seconds]<br />漏2003-2020 <a href="http://blog.jasper.es/"><span itemprop="editor">Jasper Spaans</span></a>|hosted at <a href="https://www.digitalocean.com/?refcode=9a8e99d24cf9">Digital Ocean</a> and my Meterkast|<a href="http://blog.jasper.es/categories.html#lkml-ref">Read the blog</a></td><td>聽</td></tr></table><script language="javascript" src="/js/styleswitcher.js" type="text/javascript"></script></body></html>

CINXE.COM

LKML: Andy Shevchenko: [PATCH v1 1/2] Input: wdt87xx_i2c - tidy up ACPI ID table