CINXE.COM
LKML: Greg KH: [PATCH] i2c/i2c-ite: remove interruptible_sleep_on_timeout() usage
<?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: Greg KH: [PATCH] i2c/i2c-ite: remove interruptible_sleep_on_timeout() usage</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 Greg KH" href="/groupie.php?aid=45" /><!--Matomo--><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><!--End Matomo Code--></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/2005"> [2005]</a> 聽 <a class="nb" href="/lkml/2005/3"> [Mar]</a> 聽 <a class="nb" href="/lkml/2005/3/31"> [31]</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/2005/3/31/299" onclick="this.href='/lkml/headers'+'/2005/3/31/299';">[headers]</a>聽 <a href="/lkml/bounce/2005/3/31/299">[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/2005/3/31/279">First message in thread</a></li><li><a href="/lkml/2005/3/31/279">Greg KH</a><ul><li class="origin"><a href="/lkml/2005/3/31/311">Greg KH</a><ul><li><a href="/lkml/2005/3/31/311">Greg KH</a><ul><li><a href="/lkml/2005/3/31/297">Greg KH</a><ul><li><a href="/lkml/2005/3/31/302">Greg KH</a></li></ul></li></ul></li></ul></li></ul></li></ul><div class="threadlist">Patch in this message</div><ul class="threadlist"><li><a href="/lkml/diff/2005/3/31/299/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">Subject</td><td class="rp" itemprop="name">[PATCH] i2c/i2c-ite: remove interruptible_sleep_on_timeout() usage</td></tr><tr><td class="lp">Date</td><td class="rp" itemprop="datePublished">Thu, 31 Mar 2005 15:23:09 -0800</td></tr><tr><td class="lp">From</td><td class="rp" itemprop="author">Greg KH <></td></tr></table></td><td></td></tr></table><pre itemprop="articleBody">ChangeSet 1.2322, 2005/03/31 14:05:14-08:00, domen@coderock.org<br /><br />[PATCH] i2c/i2c-ite: remove interruptible_sleep_on_timeout() usage<br /><br />Replace deprecated interruptible_sleep_on_timeout() with direct<br />wait-queue usage. Patch is compile-tested, sort of; the driver does not build in<br />vanilla kernel either, but I don't seem to add any warnings..<br /><br />Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com><br />Signed-off-by: Domen Puncer <domen@coderock.org><br />Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de><br /><br /><br /> drivers/i2c/busses/i2c-ite.c | 7 +++++--<br /> 1 files changed, 5 insertions(+), 2 deletions(-)<br /><br /><br />diff -Nru a/drivers/i2c/busses/i2c-ite.c b/drivers/i2c/busses/i2c-ite.c<br />--- a/drivers/i2c/busses/i2c-ite.c 2005-03-31 15:19:21 -08:00<br />+++ b/drivers/i2c/busses/i2c-ite.c 2005-03-31 15:19:21 -08:00<br />@@ -40,6 +40,7 @@<br /> #include <linux/delay.h><br /> #include <linux/slab.h><br /> #include <linux/init.h><br />+#include <linux/wait.h><br /> #include <asm/irq.h><br /> #include <asm/io.h><br /> <br />@@ -107,7 +108,7 @@<br /> * IIC controller interrupts.<br /> */<br /> static void iic_ite_waitforpin(void) {<br />-<br />+ DEFINE_WAIT(wait);<br /> int timeout = 2;<br /> long flags;<br /> <br />@@ -121,13 +122,15 @@<br /> spin_lock_irqsave(&lock, flags);<br /> if (iic_pending == 0) {<br /> spin_unlock_irqrestore(&lock, flags);<br />- if (interruptible_sleep_on_timeout(&iic_wait, timeout*HZ)) {<br />+ prepare_to_wait(&iic_wait, &wait, TASK_INTERRUPTIBLE);<br />+ if (schedule_timeout(timeout*HZ)) {<br /> spin_lock_irqsave(&lock, flags);<br /> if (iic_pending == 1) {<br /> iic_pending = 0;<br /> }<br /> spin_unlock_irqrestore(&lock, flags);<br /> }<br />+ finish_wait(&iic_wait, &wait);<br /> } else {<br /> iic_pending = 0;<br /> spin_unlock_irqrestore(&lock, flags);<br />-<br />To unsubscribe from this list: send the line "unsubscribe linux-kernel" in<br />the body of a message to majordomo@vger.kernel.org<br />More majordomo info at <a href="http://vger.kernel.org/majordomo-info.html">http://vger.kernel.org/majordomo-info.html</a><br />Please read the FAQ at <a href="http://www.tux.org/lkml/">http://www.tux.org/lkml/</a><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: 2005-04-06 13:31 聽聽 [from the cache]<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>