net: macb: kill useless use of list_empty()

The list_for_each_entry() macro already handles the case where the list
is empty (by not executing the loop body).  It's not necessary to handle
this case specially, so stop doing so.

Cc: Rafal Ozieblo <rafalo@cadence.com>
Acked-by: Nicolas Ferre <nicolas.ferre@microchip.com>
Signed-off-by: Julia Cartwright <julia@ni.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/cadence/macb_main.c b/drivers/net/ethernet/cadence/macb_main.c
index ebfeab853bf475b0a7417da2577801a08cb38085..b7644836aba169bcbe1258fd9bc3b566440d6631 100644 (file)
--- a/drivers/net/ethernet/cadence/macb_main.c
+++ b/drivers/net/ethernet/cadence/macb_main.c
@@ -2812,24 +2812,20 @@ static int gem_add_flow_filter(struct net_device *netdev,
                        htons(fs->h_u.tcp_ip4_spec.psrc), htons(fs->h_u.tcp_ip4_spec.pdst));
 
        /* find correct place to add in list */
-       if (list_empty(&bp->rx_fs_list.list))
-               list_add(&newfs->list, &bp->rx_fs_list.list);
-       else {
-               list_for_each_entry(item, &bp->rx_fs_list.list, list) {
-                       if (item->fs.location > newfs->fs.location) {
-                               list_add_tail(&newfs->list, &item->list);
-                               added = true;
-                               break;
-                       } else if (item->fs.location == fs->location) {
-                               netdev_err(netdev, "Rule not added: location %d not free!\n",
-                                               fs->location);
-                               ret = -EBUSY;
-                               goto err;
-                       }
+       list_for_each_entry(item, &bp->rx_fs_list.list, list) {
+               if (item->fs.location > newfs->fs.location) {
+                       list_add_tail(&newfs->list, &item->list);
+                       added = true;
+                       break;
+               } else if (item->fs.location == fs->location) {
+                       netdev_err(netdev, "Rule not added: location %d not free!\n",
+                                       fs->location);
+                       ret = -EBUSY;
+                       goto err;
                }
-               if (!added)
-                       list_add_tail(&newfs->list, &bp->rx_fs_list.list);
        }
+       if (!added)
+               list_add_tail(&newfs->list, &bp->rx_fs_list.list);
 
        gem_prog_cmp_regs(bp, fs);
        bp->rx_fs_list.count++;
@@ -2851,9 +2847,6 @@ static int gem_del_flow_filter(struct net_device *netdev,
        struct ethtool_rx_fs_item *item;
        struct ethtool_rx_flow_spec *fs;
 
-       if (list_empty(&bp->rx_fs_list.list))
-               return -EINVAL;
-
        list_for_each_entry(item, &bp->rx_fs_list.list, list) {
                if (item->fs.location == cmd->fs.location) {
                        /* disable screener regs for the flow entry */