From d01b7791daa38b2f425e44f540be4ac774aa4d5b Mon Sep 17 00:00:00 2001 From: Madhusudhan Chikkature Date: Thu, 25 Sep 2008 12:24:18 +0530 Subject: [PATCH] HDQ driver: remove unlikely calls Remove the unneeded "unlikely" calls. Signed-off-by: Madhusudhan Chikkature Acked-by: Evgeniy Polyakov Acked-by: Felipe Balbi Signed-off-by: Tony Lindgren --- drivers/w1/masters/omap_hdq.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/w1/masters/omap_hdq.c b/drivers/w1/masters/omap_hdq.c index d86793b1686..945e49022c7 100644 --- a/drivers/w1/masters/omap_hdq.c +++ b/drivers/w1/masters/omap_hdq.c @@ -138,7 +138,7 @@ static int hdq_wait_for_flag(struct hdq_data *hdq_data, u32 offset, set_current_state(TASK_UNINTERRUPTIBLE); schedule_timeout(1); } - if (unlikely(*status & flag)) + if (*status & flag) ret = -ETIMEDOUT; } else if (flag_set == OMAP_HDQ_FLAG_SET) { /* wait for the flag set */ @@ -147,7 +147,7 @@ static int hdq_wait_for_flag(struct hdq_data *hdq_data, u32 offset, set_current_state(TASK_UNINTERRUPTIBLE); schedule_timeout(1); } - if (unlikely(!(*status & flag))) + if (!(*status & flag)) ret = -ETIMEDOUT; } else return -EINVAL; @@ -182,7 +182,7 @@ hdq_write_byte(struct hdq_data *hdq_data, u8 val, u8 *status) /* wait for the TXCOMPLETE bit */ ret = wait_event_interruptible_timeout(hdq_wait_queue, hdq_data->hdq_irqstatus, OMAP_HDQ_TIMEOUT); - if (unlikely(ret < 0)) { + if (ret < 0) { dev_dbg(hdq_data->dev, "wait interrupted"); return -EINTR; } @@ -333,7 +333,7 @@ omap_hdq_break(struct hdq_data *hdq_data) /* wait for the TIMEOUT bit */ ret = wait_event_interruptible_timeout(hdq_wait_queue, hdq_data->hdq_irqstatus, OMAP_HDQ_TIMEOUT); - if (unlikely(ret < 0)) { + if (ret < 0) { dev_dbg(hdq_data->dev, "wait interrupted"); up(&hdq_data->hdq_semlock); return -EINTR; -- 2.41.0