From patchwork Wed Aug 12 10:29:42 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Viresh Kumar X-Patchwork-Id: 52336 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lb0-f200.google.com (mail-lb0-f200.google.com [209.85.217.200]) by patches.linaro.org (Postfix) with ESMTPS id 652E122ED0 for ; Wed, 12 Aug 2015 10:30:41 +0000 (UTC) Received: by lbsm2 with SMTP id m2sf4274030lbs.1 for ; Wed, 12 Aug 2015 03:30:40 -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=OtmME+7uCYc6gcavNC44z8Wl/RuOiucXGopcFv3T6h4=; b=LTrfcCG04X+SRiA/WWiz8SQzFioRL0/pT39NGuj+t+q9EudQz4uijb58RBZWdMg+XD r2d6MBagXWSTsuf2hHLDkmt6R1N20y2HLIXZyvYQ1bQsGYPwG+oWvtsIfNSAv6PXY8Bx vE/J2Ir4U+6WblOV+UnrC6OR20oN4JlOJiPjy/KCwWTRzvp5r7dJphz4852pvUB9XZbG SSTKYxeq9cOegrKjHbDpvIcBC4oD8K9nCUAAdEkzH9y+X3wCcjdjcU6S5dJcktPL6jVv +9a+VmwHgGd8CVeXbY6npvw3D5FtmtndOthR47kPGsdECUplp9+P3565uZKqGsuhRNFa W4cw== X-Gm-Message-State: ALoCoQnVEGJIQAU9Ye5Foyna62GCqIiyVFne3mj0CnWVwVq8MTKsylArQXEfrSg/VjI2bwfd57C7 X-Received: by 10.112.13.200 with SMTP id j8mr9509113lbc.14.1439375440359; Wed, 12 Aug 2015 03:30:40 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.6.196 with SMTP id d4ls29464laa.91.gmail; Wed, 12 Aug 2015 03:30:40 -0700 (PDT) X-Received: by 10.112.201.36 with SMTP id jx4mr31646833lbc.9.1439375440175; Wed, 12 Aug 2015 03:30:40 -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 dm4si3810631lbc.67.2015.08.12.03.30.40 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 12 Aug 2015 03:30:40 -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 lbbtg9 with SMTP id tg9so6967386lbb.1 for ; Wed, 12 Aug 2015 03:30:40 -0700 (PDT) X-Received: by 10.112.209.106 with SMTP id ml10mr31148160lbc.112.1439375440086; Wed, 12 Aug 2015 03:30:40 -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 l6csp234546lba; Wed, 12 Aug 2015 03:30:38 -0700 (PDT) X-Received: by 10.68.135.66 with SMTP id pq2mr56672553pbb.29.1439375437030; Wed, 12 Aug 2015 03:30:37 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id so7si8806776pab.95.2015.08.12.03.30.36; Wed, 12 Aug 2015 03:30:37 -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 S1754720AbbHLKa1 (ORCPT + 28 others); Wed, 12 Aug 2015 06:30:27 -0400 Received: from mail-pa0-f53.google.com ([209.85.220.53]:36195 "EHLO mail-pa0-f53.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934262AbbHLKaV (ORCPT ); Wed, 12 Aug 2015 06:30:21 -0400 Received: by pacrr5 with SMTP id rr5so11939574pac.3 for ; Wed, 12 Aug 2015 03:30:21 -0700 (PDT) X-Received: by 10.66.216.74 with SMTP id oo10mr66472119pac.82.1439375420889; Wed, 12 Aug 2015 03:30:20 -0700 (PDT) Received: from localhost ([122.171.186.190]) by smtp.gmail.com with ESMTPSA id cr4sm5926117pac.10.2015.08.12.03.30.19 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Wed, 12 Aug 2015 03:30:20 -0700 (PDT) From: Viresh Kumar To: trivial@kernel.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 05/10] drivers: net: Drop unlikely before IS_ERR(_OR_NULL) Date: Wed, 12 Aug 2015 15:59:42 +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.173 as permitted sender) smtp.mailfrom=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 1a5aca55ea9f..f7f6e442e94b 100644 --- a/drivers/net/ethernet/ti/netcp_core.c +++ b/drivers/net/ethernet/ti/netcp_core.c @@ -1026,7 +1026,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; @@ -1059,7 +1059,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;