From patchwork Mon Aug 10 06:12: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: 52128 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-la0-f69.google.com (mail-la0-f69.google.com [209.85.215.69]) by patches.linaro.org (Postfix) with ESMTPS id 05E4120539 for ; Mon, 10 Aug 2015 06:14:35 +0000 (UTC) Received: by labia3 with SMTP id ia3sf35642866lab.1 for ; Sun, 09 Aug 2015 23:14:34 -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=8VpEhzr6JmYpXFIho8m8UqWqIA5NGAOOwrYllCQs484=; b=aNkztNJb9O8F5HGhGBwLJyh+x/OUzrtdB/KU5pOzUR+cE67NWy3dZat+txjDwaTo4C cfam2KFyAZTMJspwLk9bVNh4LUJblOaZWudCYXaVBAJgfVTc20g4ww5kaY312v7ToXJh K2WyxezXQQ9HHzS61NfeM90vj85dBGq8jRKPlEOwjUClswZx7+Psf4+nxWzrDQRg43Ld jgYbc14V/LIhJIdv5ItWRrlwu68w6LjeHcux7uxEZ6H4fH3HZIps2O/N7KkKT84xqRPT EL/NXZM+/c3qJr5xtKWHqMxh6go8E83kvsGiZh+msHUhcFoio3ZlacE+ACuLPrYsmRxc RBcw== X-Gm-Message-State: ALoCoQm9fiEuUUE32jvBLDq8DcAVop+wiGTGyedEmNJQ6lonf7wjPzDjpBe7THiVOY3Om+TT36bX X-Received: by 10.180.205.198 with SMTP id li6mr3154729wic.5.1439187273982; Sun, 09 Aug 2015 23:14:33 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.29.100 with SMTP id j4ls708637lah.9.gmail; Sun, 09 Aug 2015 23:14:33 -0700 (PDT) X-Received: by 10.152.179.170 with SMTP id dh10mr1435583lac.22.1439187273530; Sun, 09 Aug 2015 23:14:33 -0700 (PDT) Received: from mail-lb0-f172.google.com (mail-lb0-f172.google.com. [209.85.217.172]) by mx.google.com with ESMTPS id s6si479219laj.75.2015.08.09.23.14.33 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 09 Aug 2015 23:14:33 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.172 as permitted sender) client-ip=209.85.217.172; Received: by lbbpo9 with SMTP id po9so89446090lbb.2 for ; Sun, 09 Aug 2015 23:14:33 -0700 (PDT) X-Received: by 10.152.88.78 with SMTP id be14mr18634089lab.29.1439187273315; Sun, 09 Aug 2015 23:14:33 -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 l6csp1739503lba; Sun, 9 Aug 2015 23:14:32 -0700 (PDT) X-Received: by 10.70.61.170 with SMTP id q10mr33709387pdr.96.1439187271359; Sun, 09 Aug 2015 23:14:31 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id j10si13755669pdp.182.2015.08.09.23.14.30; Sun, 09 Aug 2015 23:14:31 -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 S1753879AbbHJGO2 (ORCPT + 28 others); Mon, 10 Aug 2015 02:14:28 -0400 Received: from mail-pa0-f46.google.com ([209.85.220.46]:35803 "EHLO mail-pa0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753780AbbHJGOY (ORCPT ); Mon, 10 Aug 2015 02:14:24 -0400 Received: by pacgr6 with SMTP id gr6so19605713pac.2 for ; Sun, 09 Aug 2015 23:14:24 -0700 (PDT) X-Received: by 10.66.119.105 with SMTP id kt9mr41638113pab.86.1439187264296; Sun, 09 Aug 2015 23:14:24 -0700 (PDT) Received: from localhost ([223.227.137.11]) by smtp.gmail.com with ESMTPSA id le8sm18435927pbc.24.2015.08.09.23.14.22 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Sun, 09 Aug 2015 23:14:23 -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 V1 Resend 06/11] drivers: net: Drop unlikely before IS_ERR(_OR_NULL) Date: Mon, 10 Aug 2015 11:42:28 +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.217.172 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. Acked-by: Murali Karicheri 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 29ae672917b7..84dc3d617b90 100644 --- a/drivers/net/ethernet/ti/netcp_core.c +++ b/drivers/net/ethernet/ti/netcp_core.c @@ -1027,7 +1027,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; @@ -1060,7 +1060,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;