From patchwork Fri Jul 31 08:38:28 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Viresh Kumar X-Patchwork-Id: 51753 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f200.google.com (mail-wi0-f200.google.com [209.85.212.200]) by patches.linaro.org (Postfix) with ESMTPS id 5F0DA22A8D for ; Fri, 31 Jul 2015 08:40:03 +0000 (UTC) Received: by wicmv11 with SMTP id mv11sf5927031wic.1 for ; Fri, 31 Jul 2015 01:40:02 -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=iirVGCLXXxOwpT6Lwy3xLxQObExa8cl3Iy2kzM68fg4=; b=gK5hzt7iaDtJOdOVVxUzFonjfFElhnfPpWik8k5MaTJlul7nu2Zn8RRow/LVPFRBIf ERemHyHWFhyT/w+4V6+lULpIw2SHRKA8Jbq4IxU9/j23aQfcS48iSYd1bOEatdnZ6hZt 0PREgom3ENPcenQLndlJRg+RtKF9Ghb8wGi/GE/Dv8If46k5Hl120zvrrbV03iK+puo9 yX3nQYCc6SpwXn8E1fhfFDGMy2PCFFQuaOAPzLq5LjZlpxs9p5R6ZwKQ3E+fROBpyCCX TZbYYoYgMu2gquIQLLUEwHqnGyhMBqqIPpeJ5LPIqJ5vaKVDJ9CUJEchB6H1Kh14w1ir 7PtA== X-Gm-Message-State: ALoCoQmEV8O2NZY1Gn/8U8bdSzMn9lB0C6Wok2GGMQBA7Su5L8GtxFBb5P20Hkx+iMgtQ10HNDdX X-Received: by 10.152.27.130 with SMTP id t2mr582323lag.2.1438332002600; Fri, 31 Jul 2015 01:40:02 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.205.6 with SMTP id lc6ls285654lac.80.gmail; Fri, 31 Jul 2015 01:40:02 -0700 (PDT) X-Received: by 10.152.179.225 with SMTP id dj1mr1394467lac.53.1438332002294; Fri, 31 Jul 2015 01:40:02 -0700 (PDT) Received: from mail-lb0-f171.google.com (mail-lb0-f171.google.com. [209.85.217.171]) by mx.google.com with ESMTPS id i5si3015481lam.8.2015.07.31.01.40.02 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 31 Jul 2015 01:40:02 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.171 as permitted sender) client-ip=209.85.217.171; Received: by lbbud7 with SMTP id ud7so38089606lbb.3 for ; Fri, 31 Jul 2015 01:40:02 -0700 (PDT) X-Received: by 10.152.36.161 with SMTP id r1mr1592044laj.88.1438332002075; Fri, 31 Jul 2015 01:40:02 -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 l6csp227528lba; Fri, 31 Jul 2015 01:40:00 -0700 (PDT) X-Received: by 10.66.185.199 with SMTP id fe7mr4634613pac.48.1438331996010; Fri, 31 Jul 2015 01:39:56 -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.55; Fri, 31 Jul 2015 01:39:56 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of netdev-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 S1753103AbbGaIjn (ORCPT + 4 others); Fri, 31 Jul 2015 04:39:43 -0400 Received: from mail-pd0-f177.google.com ([209.85.192.177]:34296 "EHLO mail-pd0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752958AbbGaIjj (ORCPT ); Fri, 31 Jul 2015 04:39:39 -0400 Received: by pdbbh15 with SMTP id bh15so38959931pdb.1 for ; Fri, 31 Jul 2015 01:39:39 -0700 (PDT) X-Received: by 10.70.7.162 with SMTP id k2mr4427448pda.128.1438331979011; Fri, 31 Jul 2015 01:39:39 -0700 (PDT) Received: from localhost ([122.171.186.190]) by smtp.gmail.com with ESMTPSA id oc2sm6261979pdb.45.2015.07.31.01.39.38 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Fri, 31 Jul 2015 01:39:38 -0700 (PDT) From: Viresh Kumar To: akpm@linux-foundation.org Cc: linaro-kernel@lists.linaro.org, linux-kernel@vger.kernel.org, Viresh Kumar , Murali Karicheri , netdev@vger.kernel.org (open list:TI NETCP ETHERNET DRIVER), Wingman Kwok Subject: [PATCH 08/15] drivers: net: Drop unlikely before IS_ERR(_OR_NULL) Date: Fri, 31 Jul 2015 14:08:28 +0530 Message-Id: X-Mailer: git-send-email 2.4.0 In-Reply-To: References: In-Reply-To: References: Sender: netdev-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: netdev@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.171 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/net/ethernet/ti/netcp_core.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/ti/netcp_core.c b/drivers/net/ethernet/ti/netcp_core.c index ec8ed30196f3..f685a19a3703 100644 --- a/drivers/net/ethernet/ti/netcp_core.c +++ b/drivers/net/ethernet/ti/netcp_core.c @@ -1016,7 +1016,7 @@ netcp_tx_map_skb(struct sk_buff *skb, struct netcp_intf *netcp) } desc = knav_pool_desc_get(netcp->tx_pool); - if (unlikely(IS_ERR_OR_NULL(desc))) { + if (IS_ERR_OR_NULL(desc)) { dev_err(netcp->ndev_dev, "out of TX desc\n"); dma_unmap_single(dev, dma_addr, pkt_len, DMA_TO_DEVICE); return NULL; @@ -1049,7 +1049,7 @@ netcp_tx_map_skb(struct sk_buff *skb, struct netcp_intf *netcp) } ndesc = knav_pool_desc_get(netcp->tx_pool); - if (unlikely(IS_ERR_OR_NULL(ndesc))) { + if (IS_ERR_OR_NULL(ndesc)) { dev_err(netcp->ndev_dev, "out of TX desc for frags\n"); dma_unmap_page(dev, dma_addr, buf_len, DMA_TO_DEVICE); goto free_descs;