From mboxrd@z Thu Jan 1 00:00:00 1970 From: Kefeng Wang Subject: [PATCH] Input: alps: Drop unlikely before IS_ERR(_OR_NULL) Date: Wed, 5 Jun 2019 22:24:28 +0800 Message-ID: <20190605142428.84784-5-wangkefeng.wang@huawei.com> References: <20190605142428.84784-1-wangkefeng.wang@huawei.com> Mime-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8bit Return-path: In-Reply-To: <20190605142428.84784-1-wangkefeng.wang@huawei.com> Sender: linux-kernel-owner@vger.kernel.org To: linux-kernel@vger.kernel.org Cc: Kefeng Wang , =?UTF-8?q?Pali=20Roh=C3=A1r?= , Dmitry Torokhov , linux-input@vger.kernel.org List-Id: linux-input@vger.kernel.org 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" Cc: Dmitry Torokhov Cc: linux-input@vger.kernel.org Signed-off-by: Kefeng Wang --- 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