CINXE.COM

<?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 2/2] Input: wdt87xx_i2c - switch to use dev_err_probe()</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/1236" onclick="this.href='/lkml/headers'+'/2025/3/21/1236';">[headers]</a>聽 <a href="/lkml/bounce/2025/3/21/1236">[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 class="origin"><a href="">Andy Shevchenko</a></li><li><a href="/lkml/2025/3/21/1237">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/1236/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 2/2] Input: wdt87xx_i2c - switch to use dev_err_probe()</td></tr><tr><td class="lp">Date</td><td class="rp" itemprop="datePublished">Fri, 21 Mar 2025 20:39:18 +0200</td></tr></table></td><td></td></tr></table><pre itemprop="articleBody">Switch to use dev_err_probe() to simplify the error path and<br />unify a message template.<br /><br />Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com><br />---<br /> drivers/input/touchscreen/wdt87xx_i2c.c | 19 +++++++------------<br /> 1 file changed, 7 insertions(+), 12 deletions(-)<br /><br />diff --git a/drivers/input/touchscreen/wdt87xx_i2c.c b/drivers/input/touchscreen/wdt87xx_i2c.c<br />index 99636d6eb0f3..3e7fbc4d7549 100644<br />--- a/drivers/input/touchscreen/wdt87xx_i2c.c<br />+++ b/drivers/input/touchscreen/wdt87xx_i2c.c<br />@@ -1033,10 +1033,8 @@ static int wdt87xx_ts_create_input_device(struct wdt87xx_data *wdt)<br /> int error;<br /> <br /> input = devm_input_allocate_device(dev);<br />- if (!input) {<br />- dev_err(dev, "failed to allocate input device\n");<br />- return -ENOMEM;<br />- }<br />+ if (!input)<br />+ return dev_err_probe(dev, -ENOMEM, "failed to allocate input device\n");<br /> wdt->input = input;<br /> <br /> input->name = "WDT87xx Touchscreen";<br />@@ -1060,16 +1058,15 @@ static int wdt87xx_ts_create_input_device(struct wdt87xx_data *wdt)<br /> INPUT_MT_DIRECT | INPUT_MT_DROP_UNUSED);<br /> <br /> error = input_register_device(input);<br />- if (error) {<br />- dev_err(dev, "failed to register input device: %d\n", error);<br />- return error;<br />- }<br />+ if (error)<br />+ return dev_err_probe(dev, error, "failed to register input device\n");<br /> <br /> return 0;<br /> }<br /> <br /> static int wdt87xx_ts_probe(struct i2c_client *client)<br /> {<br />+ struct device *dev = &client->dev;<br /> struct wdt87xx_data *wdt;<br /> int error;<br /> <br />@@ -1103,10 +1100,8 @@ static int wdt87xx_ts_probe(struct i2c_client *client)<br /> NULL, wdt87xx_ts_interrupt,<br /> IRQF_ONESHOT,<br /> client->name, wdt);<br />- if (error) {<br />- dev_err(&client->dev, "request irq failed: %d\n", error);<br />- return error;<br />- }<br />+ if (error)<br />+ return dev_err_probe(dev, error, "request irq failed\n");<br /> <br /> return 0;<br /> }<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.047 / U:0.328 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>