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>

diff --git a/drivers/net/ethernet/ti/netcp_core.c b/drivers/net/ethernet/ti/netcp_core.c
index 9749dfd78c434992f4041effc3c9a7314bdace3d..734a6c4358401b3ac8fa4ac7e6456443aa16dd4c 100644 (file)
--- 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;