net: emaclite: Simplify if-else statements

Remove else as it is not required with if doing a return.
It also coalesce the format onto a single line and add the
missing space after the comma. Fixes below checkpatch warning-

WARNING: else is not generally useful after a break or return

Signed-off-by: Radhey Shyam Pandey <radhey.shyam.pandey@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/xilinx/xilinx_emaclite.c b/drivers/net/ethernet/xilinx/xilinx_emaclite.c
index 0544134959bf02ca814e1bd9fa5a6bf41e641d09..b2c7afe6efe5cae275eca54866e6a3c55b739ad2 100644 (file)
--- a/drivers/net/ethernet/xilinx/xilinx_emaclite.c
+++ b/drivers/net/ethernet/xilinx/xilinx_emaclite.c
@@ -564,19 +564,18 @@ static void xemaclite_tx_handler(struct net_device *dev)
        struct net_local *lp = netdev_priv(dev);
 
        dev->stats.tx_packets++;
-       if (lp->deferred_skb) {
-               if (xemaclite_send_data(lp,
-                                       (u8 *) lp->deferred_skb->data,
-                                       lp->deferred_skb->len) != 0)
-                       return;
-               else {
-                       dev->stats.tx_bytes += lp->deferred_skb->len;
-                       dev_kfree_skb_irq(lp->deferred_skb);
-                       lp->deferred_skb = NULL;
-                       netif_trans_update(dev); /* prevent tx timeout */
-                       netif_wake_queue(dev);
-               }
-       }
+       if (!lp->deferred_skb)
+               return;
+
+       if (xemaclite_send_data(lp, (u8 *) lp->deferred_skb->data,
+                               lp->deferred_skb->len))
+               return;
+
+       dev->stats.tx_bytes += lp->deferred_skb->len;
+       dev_kfree_skb_irq(lp->deferred_skb);
+       lp->deferred_skb = NULL;
+       netif_trans_update(dev); /* prevent tx timeout */
+       netif_wake_queue(dev);
 }
 
 /**
@@ -1052,13 +1051,12 @@ static bool get_bool(struct platform_device *ofdev, const char *s)
 {
        u32 *p = (u32 *)of_get_property(ofdev->dev.of_node, s, NULL);
 
-       if (p) {
-               return (bool)*p;
-       } else {
-               dev_warn(&ofdev->dev, "Parameter %s not found,"
-                       "defaulting to false\n", s);
+       if (!p) {
+               dev_warn(&ofdev->dev, "Parameter %s not found, defaulting to false\n", s);
                return false;
        }
+
+       return (bool)*p;
 }
 
 static const struct net_device_ops xemaclite_netdev_ops;