From mboxrd@z Thu Jan 1 00:00:00 1970 From: Denis Efremov Subject: [PATCH v3 09/11] Input: alps - remove unlikely() from IS_ERR*() condition Date: Thu, 29 Aug 2019 19:50:23 +0300 Message-ID: <20190829165025.15750-9-efremov@linux.com> References: <20190829165025.15750-1-efremov@linux.com> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Return-path: In-Reply-To: <20190829165025.15750-1-efremov@linux.com> Sender: linux-kernel-owner@vger.kernel.org To: linux-kernel@vger.kernel.org Cc: Denis Efremov , =?UTF-8?q?Pali=20Roh=C3=A1r?= , Dmitry Torokhov , Joe Perches , Andrew Morton , linux-input@vger.kernel.org List-Id: linux-input@vger.kernel.org "unlikely(IS_ERR_OR_NULL(x))" is excessive. IS_ERR_OR_NULL() already uses unlikely() internally. Signed-off-by: Denis Efremov Cc: "Pali Rohár" Cc: Dmitry Torokhov Cc: Joe Perches Cc: Andrew Morton Cc: linux-input@vger.kernel.org --- 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 34700eda0429..ed1661434899 100644 --- a/drivers/input/mouse/alps.c +++ b/drivers/input/mouse/alps.c @@ -1476,7 +1476,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.21.0