From: Madhusudhan Chikkature <madhu.cr@ti.com>
Date: Thu, 25 Sep 2008 06:54:18 +0000 (+0530)
Subject: HDQ driver: remove unlikely calls
X-Git-Tag: v2.6.27-omap1~74
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=d01b7791daa38b2f425e44f540be4ac774aa4d5b;p=linux-2.6-omap-h63xx.git

HDQ driver: remove unlikely calls

Remove the unneeded "unlikely" calls.

Signed-off-by: Madhusudhan Chikkature <madhu.cr@ti.com>
Acked-by: Evgeniy Polyakov <johnpol@2ka.mipt.ru>
Acked-by: Felipe Balbi <felipe.balbi@nokia.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
---

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;