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: 51750 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lb0-f198.google.com (mail-lb0-f198.google.com [209.85.217.198]) by patches.linaro.org (Postfix) with ESMTPS id 2F7BF22A8D for ; Fri, 31 Jul 2015 08:39:41 +0000 (UTC) Received: by lbbnr7 with SMTP id nr7sf19519308lbb.2 for ; Fri, 31 Jul 2015 01:39:40 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:in-reply-to:references :sender:precedence:list-id:x-original-sender :x-original-authentication-results:mailing-list:list-post:list-help :list-archive:list-unsubscribe; bh=5Gja75y7k6Ghq171pCWl0bKpMyQR2AznzPJa8YDBgQA=; b=K4EA+JruwoK3M5Duyt+x/l+B89KONUugpdiz3O7LF9UM92RAA+inW4zYR91xxQyTDA 8mr2EkIHfQ+1VwQVLP80YJtLx+L9kITiUQNO0H7nWDXyeqbQ1GSBB8gWd/iXez5z7QMJ ZikPGwX/VkuH9612rMqgSrBgpNz9e+GETwLLtNxl2fAKEU8BwWWLyOcjm3HFZv0ClEz9 Giq4s6s+yUpaQy9kYHXOBncEoxMdRBm3R80zi6ks2VOSGK4MNiKdyr8UC3GKgsV2mz0a a+kBUKRqdx/ZDeAxeUBKBTE3iakRZGVNyVpqCCOon9EtYI8mbGEZaEO+3f1H6zxsC98u sN1g== X-Gm-Message-State: ALoCoQnRepJEKPfIgVaq4RrxlDj6CejGCQ3u/zbhGjmavkxLwKRyiZojjvWRJvnpUpTnqWipbfgS X-Received: by 10.112.99.37 with SMTP id en5mr568946lbb.7.1438331980101; Fri, 31 Jul 2015 01:39:40 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.45.39 with SMTP id j7ls286092lam.21.gmail; Fri, 31 Jul 2015 01:39:39 -0700 (PDT) X-Received: by 10.152.179.42 with SMTP id dd10mr1598366lac.89.1438331979920; Fri, 31 Jul 2015 01:39:39 -0700 (PDT) Received: from mail-la0-f50.google.com (mail-la0-f50.google.com. [209.85.215.50]) by mx.google.com with ESMTPS id xg7si3005852lbb.48.2015.07.31.01.39.39 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 31 Jul 2015 01:39:39 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.50 as permitted sender) client-ip=209.85.215.50; Received: by labiq1 with SMTP id iq1so5065127lab.3 for ; Fri, 31 Jul 2015 01:39:39 -0700 (PDT) X-Received: by 10.112.145.169 with SMTP id sv9mr1610623lbb.73.1438331979568; Fri, 31 Jul 2015 01:39:39 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.7.198 with SMTP id l6csp227325lba; Fri, 31 Jul 2015 01:39:38 -0700 (PDT) X-Received: by 10.70.90.230 with SMTP id bz6mr4443668pdb.120.1438331978502; Fri, 31 Jul 2015 01:39:38 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id kk3si8790665pdb.118.2015.07.31.01.39.37; Fri, 31 Jul 2015 01:39:38 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752968AbbGaIja (ORCPT + 28 others); Fri, 31 Jul 2015 04:39:30 -0400 Received: from mail-pa0-f42.google.com ([209.85.220.42]:36303 "EHLO mail-pa0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752784AbbGaIj0 (ORCPT ); Fri, 31 Jul 2015 04:39:26 -0400 Received: by pachj5 with SMTP id hj5so37463906pac.3 for ; Fri, 31 Jul 2015 01:39:26 -0700 (PDT) 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-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: viresh.kumar@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.50 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , 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,