From patchwork Fri Jul 31 08:38:29 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Viresh Kumar X-Patchwork-Id: 51754 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f199.google.com (mail-wi0-f199.google.com [209.85.212.199]) by patches.linaro.org (Postfix) with ESMTPS id 6CEAF22A8D for ; Fri, 31 Jul 2015 08:40:06 +0000 (UTC) Received: by wixh2 with SMTP id h2sf6137931wix.0 for ; Fri, 31 Jul 2015 01:40:05 -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=MlpXgVUwLDgwYGn3tWVcLIc0ot/YVWjhBFDKy2qgH8g=; b=EVFlDoYZLfOYviU81GHAmlE2+cgEizf78Iedw+F//JzZNS3DMvVT155Ymcu/nz4Dkp U2Th0/t8eKH+Kb5sjf6Ssed3lmLofw1UFk7/4NFVK68XD1w6eWdt+j1koIIwVZXxSVJY cfZ1DBgefKJdI/lxg1SzLhRdxNe9O7CKHTn2+0nR2sP+6cdzdGoO0DtZyVM9J8pKFz/O 7xpWSvcJEBgBRLlNDwQ5mnimxzuk0LuNtxVsYN7fbowCx1iw7EjeU5t45031yoN5PKet Mp1hwXhLn+khaLeZODxvtygKXeMlerFeBbh9tC2iIFyRzwb2dtdy4+wiYdU8CtlpKPqI o0hw== X-Gm-Message-State: ALoCoQnqE+hqKBnN5xBFGlmInuPPjjwDHKjW1406tLVXaCIt+nw4G7lHle+5j6ZOn9Ct0nVKt7w0 X-Received: by 10.112.51.177 with SMTP id l17mr578715lbo.1.1438332005748; Fri, 31 Jul 2015 01:40:05 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.9.232 with SMTP id d8ls280726lab.13.gmail; Fri, 31 Jul 2015 01:40:05 -0700 (PDT) X-Received: by 10.112.180.201 with SMTP id dq9mr1663996lbc.78.1438332005541; Fri, 31 Jul 2015 01:40:05 -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 n2si2971282lan.167.2015.07.31.01.40.05 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 31 Jul 2015 01:40:05 -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 h7so39686568laa.0 for ; Fri, 31 Jul 2015 01:40:05 -0700 (PDT) X-Received: by 10.152.22.99 with SMTP id c3mr1675853laf.32.1438332005421; Fri, 31 Jul 2015 01:40:05 -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 l6csp227555lba; Fri, 31 Jul 2015 01:40:03 -0700 (PDT) X-Received: by 10.66.159.1 with SMTP id wy1mr4466306pab.103.1438331997447; Fri, 31 Jul 2015 01:39:57 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id r2si8822753pap.63.2015.07.31.01.39.56; Fri, 31 Jul 2015 01:39:57 -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 S1753136AbbGaIjt (ORCPT + 28 others); Fri, 31 Jul 2015 04:39:49 -0400 Received: from mail-pa0-f49.google.com ([209.85.220.49]:33861 "EHLO mail-pa0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753093AbbGaIjn (ORCPT ); Fri, 31 Jul 2015 04:39:43 -0400 Received: by pacan13 with SMTP id an13so38232721pac.1 for ; Fri, 31 Jul 2015 01:39:42 -0700 (PDT) X-Received: by 10.66.216.74 with SMTP id oo10mr4518229pac.82.1438331982846; Fri, 31 Jul 2015 01:39:42 -0700 (PDT) Received: from localhost ([122.171.186.190]) by smtp.gmail.com with ESMTPSA id cr4sm6291174pac.10.2015.07.31.01.39.41 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Fri, 31 Jul 2015 01:39:42 -0700 (PDT) From: Viresh Kumar To: akpm@linux-foundation.org Cc: linaro-kernel@lists.linaro.org, linux-kernel@vger.kernel.org, Viresh Kumar , adi-buildroot-devel@lists.sourceforge.net (moderated list:BLACKFIN RTC DRIVER), Alessandro Zummo , Alexandre Belloni , Hans Ulli Kroll , linux-arm-kernel@lists.infradead.org (moderated list:ARM/CORTINA SYSTEMS GEMINI ARM ARCHITECTURE), rtc-linux@googlegroups.com (open list:REAL TIME CLOCK (RTC) SUBSYSTEM) Subject: [PATCH 09/15] drivers: rtc: Drop unlikely before IS_ERR(_OR_NULL) Date: Fri, 31 Jul 2015 14:08:29 +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/rtc/interface.c | 2 +- drivers/rtc/rtc-bfin.c | 2 +- drivers/rtc/rtc-gemini.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/rtc/interface.c b/drivers/rtc/interface.c index 11b639067312..5836751b8203 100644 --- a/drivers/rtc/interface.c +++ b/drivers/rtc/interface.c @@ -564,7 +564,7 @@ enum hrtimer_restart rtc_pie_update_irq(struct hrtimer *timer) void rtc_update_irq(struct rtc_device *rtc, unsigned long num, unsigned long events) { - if (unlikely(IS_ERR_OR_NULL(rtc))) + if (IS_ERR_OR_NULL(rtc)) return; pm_stay_awake(rtc->dev.parent); diff --git a/drivers/rtc/rtc-bfin.c b/drivers/rtc/rtc-bfin.c index 3d44b11721ea..535a5f9338d0 100644 --- a/drivers/rtc/rtc-bfin.c +++ b/drivers/rtc/rtc-bfin.c @@ -361,7 +361,7 @@ static int bfin_rtc_probe(struct platform_device *pdev) /* Register our RTC with the RTC framework */ rtc->rtc_dev = devm_rtc_device_register(dev, pdev->name, &bfin_rtc_ops, THIS_MODULE); - if (unlikely(IS_ERR(rtc->rtc_dev))) + if (IS_ERR(rtc->rtc_dev)) return PTR_ERR(rtc->rtc_dev); /* Grab the IRQ and init the hardware */ diff --git a/drivers/rtc/rtc-gemini.c b/drivers/rtc/rtc-gemini.c index 35f4486738fc..2fed93e1114a 100644 --- a/drivers/rtc/rtc-gemini.c +++ b/drivers/rtc/rtc-gemini.c @@ -148,7 +148,7 @@ static int gemini_rtc_probe(struct platform_device *pdev) rtc->rtc_dev = rtc_device_register(pdev->name, dev, &gemini_rtc_ops, THIS_MODULE); - if (likely(IS_ERR(rtc->rtc_dev))) + if (IS_ERR(rtc->rtc_dev)) return PTR_ERR(rtc->rtc_dev); return 0;