From patchwork Fri Jul 31 08:38:22 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Viresh Kumar X-Patchwork-Id: 51762 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 B6CBE22A8D for ; Fri, 31 Jul 2015 08:49:29 +0000 (UTC) Received: by lbbyj8 with SMTP id yj8sf2429969lbb.3 for ; Fri, 31 Jul 2015 01:49:28 -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=ixJLA7shF6B9u/TxaGumwgluRXGdTdy4LHd5BlpaaRU=; b=O2bU14gghZAM9bZQ3JahJ4IBumQVXMe3g91BU0WQZfhCFdGo2cth2lp/8JkJjJWj4D HwhLxpXx1qhy/8wXT72rZw+EOLzbcIqVv28I7lEamaFmzea9yBTWmWk7tisGgWaVcNBp DtRlGnEjT3qCHqlEOonBrOXJz5mKe56oE+COhKEKLvVeScNsgD+/CYrxVQbEAXBGvY91 wItfoCoxjCbBNJYcV3qBDhSInH6Se3KTEcHhUqlQNpCbtm6chNGcVtVyPllkQtI6jbRi 0k5iX+DSgRrhqUaEw2JpQLhSDXa8ySdcFmhEXJAFSFiAjV/iayOU+dfzMV/xr8vy8r1q pLyg== X-Gm-Message-State: ALoCoQka6CEpJOCWt4Y1duKw3qwvwTNxe+uzXnvZEILg8do0AVOSDX+tmsuWHOVrIgw1SudV3zkk X-Received: by 10.194.184.6 with SMTP id eq6mr595066wjc.4.1438332568707; Fri, 31 Jul 2015 01:49:28 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.224.162 with SMTP id rd2ls266960lac.84.gmail; Fri, 31 Jul 2015 01:49:28 -0700 (PDT) X-Received: by 10.152.4.163 with SMTP id l3mr1660902lal.35.1438332568248; Fri, 31 Jul 2015 01:49:28 -0700 (PDT) Received: from mail-la0-f52.google.com (mail-la0-f52.google.com. [209.85.215.52]) by mx.google.com with ESMTPS id kx6si3009455lac.108.2015.07.31.01.49.27 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 31 Jul 2015 01:49:27 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.52 as permitted sender) client-ip=209.85.215.52; Received: by laah7 with SMTP id h7so39820792laa.0 for ; Fri, 31 Jul 2015 01:49:27 -0700 (PDT) X-Received: by 10.112.145.169 with SMTP id sv9mr1649509lbb.73.1438332567805; Fri, 31 Jul 2015 01:49:27 -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 l6csp232687lba; Fri, 31 Jul 2015 01:49:26 -0700 (PDT) X-Received: by 10.66.174.36 with SMTP id bp4mr4355000pac.133.1438332565780; Fri, 31 Jul 2015 01:49:25 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id bu7si8789503pdb.192.2015.07.31.01.49.24; Fri, 31 Jul 2015 01:49:25 -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 S1753597AbbGaItW (ORCPT + 28 others); Fri, 31 Jul 2015 04:49:22 -0400 Received: from mail-pd0-f170.google.com ([209.85.192.170]:33984 "EHLO mail-pd0-f170.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752788AbbGaIjI (ORCPT ); Fri, 31 Jul 2015 04:39:08 -0400 Received: by pdbbh15 with SMTP id bh15so38953030pdb.1 for ; Fri, 31 Jul 2015 01:39:07 -0700 (PDT) X-Received: by 10.70.133.42 with SMTP id oz10mr4449166pdb.85.1438331947577; Fri, 31 Jul 2015 01:39:07 -0700 (PDT) Received: from localhost ([122.171.186.190]) by smtp.gmail.com with ESMTPSA id v8sm6204847pdm.89.2015.07.31.01.39.06 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Fri, 31 Jul 2015 01:39:07 -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:HIBERNATION (aka Software Suspend, aka swsusp)), Pavel Machek , "Rafael J. Wysocki" Subject: [PATCH 02/15] PM / OPP: Drop unlikely before IS_ERR(_OR_NULL) Date: Fri, 31 Jul 2015 14:08:22 +0530 Message-Id: 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.52 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 677fb2843553..f60bdd5cbb71 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;