IS_ERR(_OR_NULL) already contain an 'unlikely' compiler flag,
so no need to do that again from its callers. Drop it.

Cc: "Pali Rohár" <pali.ro...@gmail.com>
Cc: Dmitry Torokhov <dmitry.torok...@gmail.com>
Cc: linux-in...@vger.kernel.org
Signed-off-by: Kefeng Wang <wangkefeng.w...@huawei.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 0a6f7ca883e7..791ef0f826c5 100644
--- a/drivers/input/mouse/alps.c
+++ b/drivers/input/mouse/alps.c
@@ -1478,7 +1478,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.20.1

Reply via email to