From: Madhusudhan Chikkature <madhu.cr@xxxxxx>
Remove the unneeded "unlikely" calls.
Signed-off-by: Madhusudhan Chikkature <madhu.cr@xxxxxx>
---
drivers/w1/masters/omap_hdq.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
Index: linux-omap-2.6/drivers/w1/masters/omap_hdq.c
===================================================================
--- linux-omap-2.6.orig/drivers/w1/masters/omap_hdq.c 2008-09-24 09:33:39.000000000 +0530
+++ linux-omap-2.6/drivers/w1/masters/omap_hdq.c 2008-09-24 10:10:07.000000000 +0530
@@ -138,7 +138,7 @@ static int hdq_wait_for_flag(struct hdq_
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_
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
/* 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;--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
