From patchwork Mon Feb 18 08:29:23 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chengguang Xu X-Patchwork-Id: 10817475 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id A8011922 for ; Mon, 18 Feb 2019 08:30:27 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 909B02A30E for ; Mon, 18 Feb 2019 08:30:27 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7F40C2A341; Mon, 18 Feb 2019 08:30:27 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,FREEMAIL_FROM, MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 15E372A30E for ; Mon, 18 Feb 2019 08:30:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729240AbfBRIaZ (ORCPT ); Mon, 18 Feb 2019 03:30:25 -0500 Received: from mout.gmx.net ([212.227.17.22]:49617 "EHLO mout.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729239AbfBRIaZ (ORCPT ); Mon, 18 Feb 2019 03:30:25 -0500 Received: from localhost.localdomain ([218.18.229.179]) by mail.gmx.com (mrgmx101 [212.227.17.174]) with ESMTPSA (Nemesis) id 0Lat5o-1hJwWR0jnM-00kM9d; Mon, 18 Feb 2019 09:30:12 +0100 From: Chengguang Xu To: pali.rohar@gmail.com, dmitry.torokhov@gmail.com, rydberg@bitmath.org Cc: mchehab+samsung@kernel.org, masaki.ota@jp.alps.com, linux-input@vger.kernel.org, Chengguang Xu Subject: [PATCH] input: remove redundant unlikely annotation Date: Mon, 18 Feb 2019 16:29:23 +0800 Message-Id: <20190218082923.24870-1-cgxu519@gmx.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-Provags-ID: V03:K1:8LmNiXj1ghu5vJklXQd+sOsjM8KAD8nBTejN3iOQqQw6cKcRNLO Q0VeqxC5wp8vdnkGCam6nhIDQ9zMHd1gSYQ6ndAn9oUoX/8QaktKRzzBssA//27nma+Zcaq VbP8jAdH6gmM8bHout1PpL2tyjgqRLwT19hugQZgHF21RaBD+R0ia27eGnIHIP4IlWjggg3 La8/gRQMKoWe5d5BYhj1Q== X-UI-Out-Filterresults: notjunk:1;V03:K0:piQhUyFwHpY=:hc5VPIDw1WxiJL7z2mJRY1 sra/1WEZ237ZXIiSJ5qjT4vPKz8vJsOBRpr/voqx1oIHHdbUK68akR0QAdVRoFPhqXuBBMVQS Hdk79gpdm14k24/xhYPGYtGDtq8rJ5hAHGBk/t7wpwrTcglbfkRafF2cz7SPkSRRoSJbg+qH3 47/nTnpZXqGnj5GY5a+UVC/WMhUYn1bktaV8ExVb1JKVZ6my3h6oFu5WpIyfKqoxVgXQaOMuT 8F8uIUlUumLRssHRBHW81TDbbCl3BgcCyha9gV32na2MofG/Za65JarKLPGcRwfcd3VCSfMa8 6+Zb0qC87vFdo45+vBM0t9u7kv4z3DEmZU1qqd8472bvG0UyZ/fn8BLXJbqIHEqc/DVh1q1oN crWdWPMx6dC10XfcWzvFjcf6TrAv/ZPCXZFEU9t9K1LF7+B6R5JVPd5K6oT9JV07QBQ7SSulz buCrDQsdYZvQpVhBjBVfy+Vl4PPq4AgvSZ4JKjDzssSglfK89pKxskRrXspZyLGiNucb0/g+E ZcCK4Mv/ULM7wGwCRtp1aiQPXasfkfsxA5TOi2x0uSPjEpOREbX+noSEQEsCwqPGI4pgvO1zg deBfbKvnhj1h93bBrmQXI4uKkjgIvOXp4Pp1AD3rPyp0tHYGuXy/iWfyA+j40L1vV25titsew 2lOHOhprEE6stvRZS0jU4vKlxDDp1aZvY5URqRdWABzebwSg9rUl2wwlHdPi4uGYECarutoBc 9cOFcZGRRuE2L4+U0+G+Wum4JUTdwpdFsr574saAsIIy7OG9t83TNFHQjIzPaqazKc9lUfqax W7U4p4g65Z1yYw8JSlAV2J35DG5N23p3KfDDzK0rHu2HA4aA/Mpk/mxWFCmn2xf54HXvOG1J4 hxRUVZeK+CKKHIse0dtxVDfuTAthYqZx135grNsAKLuoxiINPZ+qIBYl2Jpujj Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP unlikely has already included in IS_ERR_OR_NULL(), so just remove redundant unlikely annotation. Signed-off-by: Chengguang Xu --- 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,