Login | Register For Free | Help
Search for: (Advanced)

Mailing List Archive: Linux: Kernel

[PATCH 2/2] ARM: omap_hdq: use wait_event_timeout to wait for read to complete.

 

 

Linux kernel RSS feed   Index | Next | Previous | View Threaded


neilb at suse

Apr 24, 2012, 7:41 PM

Post #1 of 3 (69 views)
Permalink
[PATCH 2/2] ARM: omap_hdq: use wait_event_timeout to wait for read to complete.

There is no gain in having a loop - there is no risk of missing the
interrupt with wait_event_timeout.

Signed-off-by: NeilBrown <neilb [at] suse>
---
drivers/w1/masters/omap_hdq.c | 15 ++++++---------
1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/drivers/w1/masters/omap_hdq.c b/drivers/w1/masters/omap_hdq.c
index 3356d75..eb01c7f 100644
--- a/drivers/w1/masters/omap_hdq.c
+++ b/drivers/w1/masters/omap_hdq.c
@@ -357,7 +357,6 @@ static int hdq_read_byte(struct hdq_data *hdq_data, u8 *val)
{
int ret = 0;
u8 status;
- unsigned long timeout = jiffies + OMAP_HDQ_TIMEOUT;

ret = mutex_lock_interruptible(&hdq_data->hdq_mutex);
if (ret < 0) {
@@ -375,15 +374,13 @@ static int hdq_read_byte(struct hdq_data *hdq_data, u8 *val)
OMAP_HDQ_CTRL_STATUS_DIR | OMAP_HDQ_CTRL_STATUS_GO,
OMAP_HDQ_CTRL_STATUS_DIR | OMAP_HDQ_CTRL_STATUS_GO);
/*
- * The RX comes immediately after TX. It
- * triggers another interrupt before we
- * sleep. So we have to wait for RXCOMPLETE bit.
+ * The RX comes immediately after TX.
*/
- while (!(hdq_data->hdq_irqstatus
- & OMAP_HDQ_INT_STATUS_RXCOMPLETE)
- && time_before(jiffies, timeout)) {
- schedule_timeout_uninterruptible(1);
- }
+ wait_event_timeout(hdq_wait_queue,
+ (hdq_data->hdq_irqstatus
+ & OMAP_HDQ_INT_STATUS_RXCOMPLETE),
+ OMAP_HDQ_TIMEOUT);
+
hdq_reg_merge(hdq_data, OMAP_HDQ_CTRL_STATUS, 0,
OMAP_HDQ_CTRL_STATUS_DIR);
status = hdq_data->hdq_irqstatus;
--
1.7.10
Attachments: signature.asc (0.81 KB)


zbr at ioremap

May 1, 2012, 2:42 PM

Post #2 of 3 (63 views)
Permalink
Re: [PATCH 2/2] ARM: omap_hdq: use wait_event_timeout to wait for read to complete. [In reply to]

On Wed, Apr 25, 2012 at 12:41:53PM +1000, NeilBrown (neilb [at] suse) wrote:
> There is no gain in having a loop - there is no risk of missing the
> interrupt with wait_event_timeout.
>
> Signed-off-by: NeilBrown <neilb [at] suse>

Both patches look good, thank you
Feel free to add my ack if needed

--
Evgeniy Polyakov
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo [at] vger
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/


neilb at suse

May 1, 2012, 11:27 PM

Post #3 of 3 (62 views)
Permalink
Re: [PATCH 2/2] ARM: omap_hdq: use wait_event_timeout to wait for read to complete. [In reply to]

On Wed, 2 May 2012 01:42:19 +0400 Evgeniy Polyakov <zbr [at] ioremap> wrote:

> On Wed, Apr 25, 2012 at 12:41:53PM +1000, NeilBrown (neilb [at] suse) wrote:
> > There is no gain in having a loop - there is no risk of missing the
> > interrupt with wait_event_timeout.
> >
> > Signed-off-by: NeilBrown <neilb [at] suse>
>
> Both patches look good, thank you
> Feel free to add my ack if needed
>

Thanks. I'll add that and resent to GregKH.

NeilBrown
Attachments: signature.asc (0.81 KB)

Linux kernel RSS feed   Index | Next | Previous | View Threaded
 
 


Interested in having your list archived? Contact Gossamer Threads
 
  Web Applications & Managed Hosting Powered by Gossamer Threads Inc.