From patchwork Tue Sep 26 09:29:51 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tobias Klauser X-Patchwork-Id: 9971575 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 6ACC960365 for ; Tue, 26 Sep 2017 09:34:59 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 63AC8288DB for ; Tue, 26 Sep 2017 09:34:59 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 57F3C28992; Tue, 26 Sep 2017 09:34:59 +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=-6.9 required=2.0 tests=BAYES_00,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 859C0288DB for ; Tue, 26 Sep 2017 09:34:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965144AbdIZJe5 (ORCPT ); Tue, 26 Sep 2017 05:34:57 -0400 Received: from mail.zhinst.com ([212.126.164.98]:46568 "EHLO mail.zhinst.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965142AbdIZJe4 (ORCPT ); Tue, 26 Sep 2017 05:34:56 -0400 X-Greylist: delayed 302 seconds by postgrey-1.27 at vger.kernel.org; Tue, 26 Sep 2017 05:34:56 EDT Received: from ziws08.zhinst.com ([10.42.0.7]) by mail.zhinst.com (Kerio Connect 9.2.4) with ESMTP; Tue, 26 Sep 2017 11:29:51 +0200 From: Tobias Klauser To: =?UTF-8?q?Pali=20Roh=C3=A1r?= , Dmitry Torokhov Cc: linux-input@vger.kernel.org Subject: [PATCH] Input: ALPS - remove redundant unlikely() Date: Tue, 26 Sep 2017 11:29:51 +0200 Message-Id: <20170926092951.26721-1-tklauser@distanz.ch> X-Mailer: git-send-email 2.13.0 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 IS_ERR_OR_NULL() already implies unlikely(), so it can be omitted. Signed-off-by: Tobias Klauser --- 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 850b00e3ad8e..2aaceb1e9d4f 100644 --- a/drivers/input/mouse/alps.c +++ b/drivers/input/mouse/alps.c @@ -1486,7 +1486,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,