From patchwork Fri Jul 31 08:38:25 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Viresh Kumar X-Patchwork-Id: 6909091 Return-Path: X-Original-To: patchwork-linux-input@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id A3F0D9F380 for ; Fri, 31 Jul 2015 08:48:11 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D6F6120498 for ; Fri, 31 Jul 2015 08:48:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id DFEB620462 for ; Fri, 31 Jul 2015 08:48:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752936AbbGaIj3 (ORCPT ); Fri, 31 Jul 2015 04:39:29 -0400 Received: from mail-pa0-f52.google.com ([209.85.220.52]:35045 "EHLO mail-pa0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752912AbbGaIj0 (ORCPT ); Fri, 31 Jul 2015 04:39:26 -0400 Received: by pabkd10 with SMTP id kd10so37553048pab.2 for ; Fri, 31 Jul 2015 01:39:26 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:in-reply-to:references; bh=0h1DCnD2t1uYpTjvEBjdBA6XTIsbVNjEMQPGu8mwwYk=; b=JLZeLNyFalB4H/VX0h8DZ+dsAai23sbsYJVbqMzFCFcjNtsSuM42H9nZ3DWf8UCd2h oc8o1h9D+zgUNJOPLWeXoYMEKQlFsQrbaSP6kL9hkPbL/xUFue8ISTKWEltoDnLM5JMx DKyntRGoFfZhY0RTyqz9SAkC/JYMHzy0Z3MZrZuzTnAXd4diP6YnuSeE6u9OLlf2SKL9 T3LpPF83qnRwJYMpKIEbMLYG0xlsfFYj5QhJZIFX3pCxhkvvQotMLMAPAxb5Zil2hp8O jnwdNrKxZph7OjuViHCCYUw5agRC0uAKDzsBP4DTY+wzhiyBace6U5vOhxowFnfdQoGS TSUw== X-Gm-Message-State: ALoCoQl/NBU+VQXyyMhgvCbmH4NGCYP/lJETGEKR8zK9ljmOO7+qyBzUf/33JVywqaaiqfLf3Rem X-Received: by 10.66.101.104 with SMTP id ff8mr4424586pab.59.1438331966010; Fri, 31 Jul 2015 01:39:26 -0700 (PDT) Received: from localhost ([122.171.186.190]) by smtp.gmail.com with ESMTPSA id k5sm6269299pda.34.2015.07.31.01.39.24 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Fri, 31 Jul 2015 01:39:25 -0700 (PDT) From: Viresh Kumar To: akpm@linux-foundation.org Cc: linaro-kernel@lists.linaro.org, linux-kernel@vger.kernel.org, Viresh Kumar , Dmitry Torokhov , Hans de Goede , linux-input@vger.kernel.org (open list:INPUT (KEYBOARD, MOUSE, JOYSTICK , TOUCHSCREEN)...), Masaki Ota , =?UTF-8?q?Pali=20Roh=C3=A1r?= Subject: [PATCH 05/15] drivers: input: Drop unlikely before IS_ERR(_OR_NULL) Date: Fri, 31 Jul 2015 14:08:25 +0530 Message-Id: <72b53f2cabc15cf3d019041a0ed605ca7c24d19b.1438331416.git.viresh.kumar@linaro.org> X-Mailer: git-send-email 2.4.0 In-Reply-To: References: In-Reply-To: References: Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Spam-Status: No, score=-8.3 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP IS_ERR(_OR_NULL) already contain an 'unlikely' compiler flag and there is no need to do that again from its callers. Drop it. Signed-off-by: Viresh Kumar --- 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 113d6f1516a5..cef3611a4ccd 100644 --- a/drivers/input/mouse/alps.c +++ b/drivers/input/mouse/alps.c @@ -1365,7 +1365,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,