From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755437AbbJAC40 (ORCPT ); Wed, 30 Sep 2015 22:56:26 -0400 Received: from m50-135.163.com ([123.125.50.135]:43618 "EHLO m50-135.163.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755094AbbJAC4N (ORCPT ); Wed, 30 Sep 2015 22:56:13 -0400 From: Geliang Tang To: Dmitry Torokhov , Hans de Goede , =?UTF-8?q?Pali=20Roh=C3=A1r?= , Masaki Ota Cc: Geliang Tang , linux-input@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/3] Input: alps: drop unlikely before IS_ERR_OR_NULL Date: Thu, 1 Oct 2015 10:55:30 +0800 Message-Id: <081982d1188978b6020952afb4c2dcf3bc42fa1f.1443667610.git.geliangtang@163.com> X-Mailer: git-send-email 2.5.0 In-Reply-To: <03d18502ed7ed417f136c091f417d2d88c147ec6.1443667610.git.geliangtang@163.com> References: <03d18502ed7ed417f136c091f417d2d88c147ec6.1443667610.git.geliangtang@163.com> In-Reply-To: <03d18502ed7ed417f136c091f417d2d88c147ec6.1443667610.git.geliangtang@163.com> References: <03d18502ed7ed417f136c091f417d2d88c147ec6.1443667610.git.geliangtang@163.com> X-CM-TRANSID: D9GowADHSpmyoAxWYiDMCg--.26913S3 X-Coremail-Antispam: 1Uf129KBjvdXoW7JrWxZr1kuFyxKF18CF45ZFb_yoWfGrb_WF y8Zrs7Xw12yF1vyw15Cw1avrWvy3ZaqrWkAw4F939xJF1xZrZxJ3yDZF4kZr4UW3yxCF98 Kw13Gr1ruw47KjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUvcSsGvfC2KfnxnUUI43ZEXa7IUjsmitUUUUU== X-Originating-IP: [116.77.128.85] X-CM-SenderInfo: 5jhoxtpqjwt0rj6rljoofrz/1tbiJRSGmVUL7OhjdQAAsi Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org IS_ERR_OR_NULL already contain an unlikely compiler flag. Drop it. Signed-off-by: Geliang Tang --- 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