diff options
| author | Viresh Kumar <viresh.kumar@linaro.org> | 2015-08-12 15:59:42 +0530 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2015-09-29 15:12:18 +0200 |
| commit | bf69a3b60e4d892f8c1d7a6b18cf84aaa7acd43f (patch) | |
| tree | daed07abbe8552b558a0828f6e6f1979102e26e0 | |
| parent | d9902d597ac54c8abc02e37492e2bc102f31e83f (diff) | |
| download | linux-stable-bf69a3b60e4d892f8c1d7a6b18cf84aaa7acd43f.tar.gz linux-stable-bf69a3b60e4d892f8c1d7a6b18cf84aaa7acd43f.tar.bz2 linux-stable-bf69a3b60e4d892f8c1d7a6b18cf84aaa7acd43f.zip | |
drivers: net: Drop unlikely before IS_ERR(_OR_NULL)
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 <m-karicheri2@ti.com>
Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
| -rw-r--r-- | drivers/net/ethernet/ti/netcp_core.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/ti/netcp_core.c b/drivers/net/ethernet/ti/netcp_core.c index 9749dfd78c43..734a6c435840 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; |