Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753493AbbGaPEc (ORCPT ); Fri, 31 Jul 2015 11:04:32 -0400 Received: from devils.ext.ti.com ([198.47.26.153]:53135 "EHLO devils.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753112AbbGaPEa (ORCPT ); Fri, 31 Jul 2015 11:04:30 -0400 Message-ID: <55BB8E7B.7050307@ti.com> Date: Fri, 31 Jul 2015 11:04:27 -0400 From: Murali Karicheri Organization: Texas Instruments User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.2.0 MIME-Version: 1.0 To: Viresh Kumar , CC: , , open list: TI NETCP ETHERNET DRIVER , Wingman Kwok , ; Illegal-Object: Syntax error in CC: address found on vger.kernel.org: CC: ; ^-missing semicolon to end mail group, extraneous tokens in mailbox, missing end of mailbox Subject: Re: [PATCH 08/15] drivers: net: Drop unlikely before IS_ERR(_OR_NULL) References: In-Reply-To: Content-Type: text/plain; charset="windows-1252"; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1856 Lines: 55 On 07/31/2015 04:38 AM, Viresh Kumar wrote: > IS_ERR(_OR_NULL) already contain an 'unlikely' compiler flag and there > is no need to do that again from its callers. Drop it. > IS_ERR_OR_NULL() is defined as static inline bool __must_check IS_ERR_OR_NULL(__force const void *ptr) { return !ptr || IS_ERR_VALUE((unsigned long)ptr); } So the unlikely() applies only to second part. Wouldn't that be a problem for optimization? Murali > 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; > -- Murali Karicheri Linux Kernel, Keystone -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/