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 d86793b16867ed127b4035255fa01694cfdeee8f..945e49022c7903b6de820a25245c18dd390e79d2 100644 (file)
--- 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;