ARM: omap_hdq: use wait_event_timeout to wait for read to complete.
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 <[email protected]>
--- drivers/w1/masters/omap_hdq.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-)
drivers/w1/masters/omap_hdq.c +6 -9
@@ -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;
Signature · 1 line
1.7.10
Quoted 4 lines · NeilBrown
There is no gain in having a loop - there is no risk of missing the interrupt with
wait_event_timeout.Signed-off-by NeilBrown <[email protected]>
Both patches look good, thank you
Feel free to add my ack if needed
Signature · 1 line
Evgeniy Polyakov
Quoted 9 lines · On Wed, 2 May 2012 01:42:19 +0400 Evgeniy Polyakov <[email protected]> wrote:
Quoted 4 lines · NeilBrown
There is no gain in having a loop - there is no risk of missing the interrupt with
wait_event_timeout.Signed-off-by NeilBrown <[email protected]>Both patches look good, thank you
Feel free to add my ack if needed
Thanks. I'll add that and resent to GregKH.
NeilBrown