[PATCH 2/3] Input: alps: drop unlikely before IS_ERR_OR_NULL

From	Geliang Tang <geliangtang@163.com>
Newsgroups	linux.kernel
Subject	[PATCH 2/3] Input: alps: drop unlikely before IS_ERR_OR_NULL
Date	2015-10-01 05:00 +0200
Message-ID	<qeCga-7xw-9@gated-at.bofh.it> (permalink)
References	<qeCg9-7xw-5@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

IS_ERR_OR_NULL already contain an unlikely compiler flag. Drop it.

Signed-off-by: Geliang Tang <geliangtang@163.com>
---
 drivers/input/mouse/alps.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/input/mouse/alps.c b/drivers/input/mouse/alps.c
index 4d24686..b4f146a 100644
--- a/drivers/input/mouse/alps.c
+++ b/drivers/input/mouse/alps.c
@@ -1367,7 +1367,7 @@ static void alps_report_bare_ps2_packet(struct psmouse *psmouse,
 		/* On V2 devices the DualPoint Stick reports bare packets */
 		dev = priv->dev2;
 		dev2 = psmouse->dev;
-	} else if (unlikely(IS_ERR_OR_NULL(priv->dev3))) {
+	} else if (IS_ERR_OR_NULL(priv->dev3)) {
 		/* Register dev3 mouse if we received PS/2 packet first time */
 		if (!IS_ERR(priv->dev3))
 			psmouse_queue_work(psmouse, &priv->dev3_register_work,
-- 
2.5.0


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[PATCH 2/3] Input: alps: drop unlikely before IS_ERR_OR_NULL Geliang Tang <geliangtang@163.com> - 2015-10-01 05:00 +0200
  Re: [PATCH 2/3] Input: alps: drop unlikely before IS_ERR_OR_NULL Pali Rohár <pali.rohar@gmail.com> - 2015-10-01 09:40 +0200
    Re: [PATCH 2/3] Input: alps: drop unlikely before IS_ERR_OR_NULL Dmitry Torokhov <dmitry.torokhov@gmail.com> - 2015-10-02 20:30 +0200

csiph-web