From patchwork Mon Aug 10 06:12:24 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Viresh Kumar X-Patchwork-Id: 52124 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lb0-f197.google.com (mail-lb0-f197.google.com [209.85.217.197]) by patches.linaro.org (Postfix) with ESMTPS id 0B42A20539 for ; Mon, 10 Aug 2015 06:13:19 +0000 (UTC) Received: by lbck9 with SMTP id k9sf6430534lbc.0 for ; Sun, 09 Aug 2015 23:13:18 -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=RqBSxAANSSTYQlivCezWrLoDOKuFoTHxojAslqkK3cA=; b=LlwmqXMfI6w1LywyCPDrD8wgJeV1J0ruiAVturXcYTX41gQOawNIyVfvUYaJsJfKWC JzMJi6PpUbbEHY2Zq1ejODm5fxXunth2kap1svHo99Nk8pvOjXoQklvu+BZAwUvDb/X9 Y7aYAcoihy4YJFD8TJQvT3Yo3iJh3qV6Og3EfVFr+YXnae1Vy5DYQ0b4LRgCYHYbAhRc uzz/zlkswCk2j6X3mwK3RhCuX+0Q6VM5kl4Av8PhxohpMdcmN6C7OJPUw61HtZqRCkTu 2Ghy7qMNJTYnoPJ3Z0rlr1sJNM2qqPMUDl/zvnS26wjGceg6pWiLRHLxC0SX6DGO1DR8 Vb7w== X-Gm-Message-State: ALoCoQlrsl7vwa4Lh7cqvqFJ4Nxw33MB0yZxImGpqf0+v4gBUHa4Xmg4riEXvtvo/bqzmK+feVKa X-Received: by 10.194.188.104 with SMTP id fz8mr5799858wjc.1.1439187197937; Sun, 09 Aug 2015 23:13:17 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.23.135 with SMTP id m7ls645018laf.103.gmail; Sun, 09 Aug 2015 23:13:17 -0700 (PDT) X-Received: by 10.112.125.34 with SMTP id mn2mr17148440lbb.76.1439187197650; Sun, 09 Aug 2015 23:13:17 -0700 (PDT) Received: from mail-lb0-f173.google.com (mail-lb0-f173.google.com. [209.85.217.173]) by mx.google.com with ESMTPS id eq12si13360341lac.171.2015.08.09.23.13.17 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 09 Aug 2015 23:13:17 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.173 as permitted sender) client-ip=209.85.217.173; Received: by lbbpu9 with SMTP id pu9so61802553lbb.3 for ; Sun, 09 Aug 2015 23:13:17 -0700 (PDT) X-Received: by 10.112.140.68 with SMTP id re4mr18684165lbb.72.1439187197428; Sun, 09 Aug 2015 23:13:17 -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 l6csp1739088lba; Sun, 9 Aug 2015 23:13:16 -0700 (PDT) X-Received: by 10.68.166.196 with SMTP id zi4mr40864594pbb.83.1439187195526; Sun, 09 Aug 2015 23:13:15 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id bh5si31341589pbb.235.2015.08.09.23.13.14; Sun, 09 Aug 2015 23:13:15 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-pm-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 S1753417AbbHJGNM (ORCPT + 12 others); Mon, 10 Aug 2015 02:13:12 -0400 Received: from mail-pd0-f176.google.com ([209.85.192.176]:33027 "EHLO mail-pd0-f176.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752614AbbHJGNK (ORCPT ); Mon, 10 Aug 2015 02:13:10 -0400 Received: by pdrh1 with SMTP id h1so49693366pdr.0 for ; Sun, 09 Aug 2015 23:13:10 -0700 (PDT) X-Received: by 10.70.39.34 with SMTP id m2mr36707653pdk.148.1439187190528; Sun, 09 Aug 2015 23:13:10 -0700 (PDT) Received: from localhost ([223.227.137.11]) by smtp.gmail.com with ESMTPSA id fx4sm6767682pbb.92.2015.08.09.23.13.00 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Sun, 09 Aug 2015 23:13:09 -0700 (PDT) From: Viresh Kumar To: akpm@linux-foundation.org Cc: linaro-kernel@lists.linaro.org, linux-kernel@vger.kernel.org, Viresh Kumar , Greg Kroah-Hartman , Len Brown , linux-pm@vger.kernel.org (open list:SUSPEND TO RAM), Pavel Machek , "Rafael J. Wysocki" Subject: [PATCH V1 Resend 02/11] PM / OPP: Drop unlikely before IS_ERR(_OR_NULL) Date: Mon, 10 Aug 2015 11:42:24 +0530 Message-Id: X-Mailer: git-send-email 2.4.0 In-Reply-To: References: In-Reply-To: References: Sender: linux-pm-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-pm@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.217.173 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/base/power/opp.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/base/power/opp.c b/drivers/base/power/opp.c index 3b188f20b43f..1a6bbfa53b6f 100644 --- a/drivers/base/power/opp.c +++ b/drivers/base/power/opp.c @@ -134,7 +134,7 @@ static struct device_opp *_find_device_opp(struct device *dev) { struct device_opp *tmp_dev_opp, *dev_opp = ERR_PTR(-ENODEV); - if (unlikely(IS_ERR_OR_NULL(dev))) { + if (IS_ERR_OR_NULL(dev)) { pr_err("%s: Invalid parameters\n", __func__); return ERR_PTR(-EINVAL); } @@ -172,7 +172,7 @@ unsigned long dev_pm_opp_get_voltage(struct dev_pm_opp *opp) opp_rcu_lockdep_assert(); tmp_opp = rcu_dereference(opp); - if (unlikely(IS_ERR_OR_NULL(tmp_opp)) || !tmp_opp->available) + if (IS_ERR_OR_NULL(tmp_opp) || !tmp_opp->available) pr_err("%s: Invalid parameters\n", __func__); else v = tmp_opp->u_volt; @@ -204,7 +204,7 @@ unsigned long dev_pm_opp_get_freq(struct dev_pm_opp *opp) opp_rcu_lockdep_assert(); tmp_opp = rcu_dereference(opp); - if (unlikely(IS_ERR_OR_NULL(tmp_opp)) || !tmp_opp->available) + if (IS_ERR_OR_NULL(tmp_opp) || !tmp_opp->available) pr_err("%s: Invalid parameters\n", __func__); else f = tmp_opp->rate;