From: Joe Perches <joe@perches.com> To: Radhey Shyam Pandey <radhey.shyam.pandey@xilinx.com>, davem@davemloft.net, andrew@lunn.ch, michal.simek@xilinx.com Cc: netdev@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH 2/5] net: emaclite: Balance braces in else statement Date: Mon, 18 Jun 2018 09:03:26 -0700 [thread overview] Message-ID: <644296b273a76469baf641dd712c7a5451cd34fe.camel@perches.com> (raw) In-Reply-To: <1529322610-27215-3-git-send-email-radhey.shyam.pandey@xilinx.com> On Mon, 2018-06-18 at 17:20 +0530, Radhey Shyam Pandey wrote: > Remove else as it is not required with if doing a return. > Fixes below checkpatch warning. > WARNING: else is not generally useful after a break or return checkpatch is stupid and doesn't understand code flow. Always try to improve code flow instead of merely following brainless instructions from a script. So: > diff --git a/drivers/net/ethernet/xilinx/xilinx_emaclite.c b/drivers/net/ethernet/xilinx/xilinx_emaclite.c [] > @@ -569,13 +569,11 @@ static void xemaclite_tx_handler(struct net_device *dev) > (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); > - } > + 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 you really want to redo this function, perhaps something like: static void xemaclite_tx_handler(struct net_device *dev) { struct net_local *lp = netdev_priv(dev); dev->stats.tx_packets++; 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 +1050,13 @@ 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) { > + if (p) > return (bool)*p; > - } else { > - dev_warn(&ofdev->dev, "Parameter %s not found," > + > + dev_warn(&ofdev->dev, "Parameter %s not found," > "defaulting to false\n", s); > - return false; > - } > + > + return false; > } And this function has backward logic as the failure paths are the ones that should return early or use a goto. Perhaps something like: 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) { dev_warn(&ofdev->dev, "Parameter '%s' not found, defaulting to false\n", s); return false; } return *p; }
WARNING: multiple messages have this Message-ID (diff)
From: joe@perches.com (Joe Perches) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 2/5] net: emaclite: Balance braces in else statement Date: Mon, 18 Jun 2018 09:03:26 -0700 [thread overview] Message-ID: <644296b273a76469baf641dd712c7a5451cd34fe.camel@perches.com> (raw) In-Reply-To: <1529322610-27215-3-git-send-email-radhey.shyam.pandey@xilinx.com> On Mon, 2018-06-18 at 17:20 +0530, Radhey Shyam Pandey wrote: > Remove else as it is not required with if doing a return. > Fixes below checkpatch warning. > WARNING: else is not generally useful after a break or return checkpatch is stupid and doesn't understand code flow. Always try to improve code flow instead of merely following brainless instructions from a script. So: > diff --git a/drivers/net/ethernet/xilinx/xilinx_emaclite.c b/drivers/net/ethernet/xilinx/xilinx_emaclite.c [] > @@ -569,13 +569,11 @@ static void xemaclite_tx_handler(struct net_device *dev) > (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); > - } > + 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 you really want to redo this function, perhaps something like: static void xemaclite_tx_handler(struct net_device *dev) { struct net_local *lp = netdev_priv(dev); dev->stats.tx_packets++; 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 +1050,13 @@ 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) { > + if (p) > return (bool)*p; > - } else { > - dev_warn(&ofdev->dev, "Parameter %s not found," > + > + dev_warn(&ofdev->dev, "Parameter %s not found," > "defaulting to false\n", s); > - return false; > - } > + > + return false; > } And this function has backward logic as the failure paths are the ones that should return early or use a goto. Perhaps something like: 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) { dev_warn(&ofdev->dev, "Parameter '%s' not found, defaulting to false\n", s); return false; } return *p; }
next prev parent reply other threads:[~2018-06-18 16:03 UTC|newest] Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-06-18 11:50 [PATCH 0/5] Fixes coding style in xilinx_emaclite.c Radhey Shyam Pandey 2018-06-18 11:50 ` Radhey Shyam Pandey 2018-06-18 11:50 ` [PATCH 1/5] net: emaclite: Use __func__ instead of hardcoded name Radhey Shyam Pandey 2018-06-18 11:50 ` Radhey Shyam Pandey 2018-06-18 11:50 ` Radhey Shyam Pandey 2018-06-18 11:50 ` [PATCH 2/5] net: emaclite: Balance braces in else statement Radhey Shyam Pandey 2018-06-18 11:50 ` Radhey Shyam Pandey 2018-06-18 16:03 ` Joe Perches [this message] 2018-06-18 16:03 ` Joe Perches 2018-06-19 5:42 ` Radhey Shyam Pandey 2018-06-19 5:42 ` Radhey Shyam Pandey 2018-06-19 5:42 ` Radhey Shyam Pandey 2018-06-18 11:50 ` [PATCH 3/5] net: emaclite: update kernel-doc comments Radhey Shyam Pandey 2018-06-18 11:50 ` Radhey Shyam Pandey 2018-06-18 11:50 ` [PATCH 4/5] net: emaclite: Fix block comments style Radhey Shyam Pandey 2018-06-18 11:50 ` Radhey Shyam Pandey 2018-06-18 11:50 ` [PATCH 5/5] net: emaclite: Remove unnecessary spaces Radhey Shyam Pandey 2018-06-18 11:50 ` Radhey Shyam Pandey 2018-06-19 22:55 ` [PATCH 0/5] Fixes coding style in xilinx_emaclite.c David Miller 2018-06-19 22:55 ` David Miller -- strict thread matches above, loose matches on Subject: below -- 2018-06-18 11:08 Radhey Shyam Pandey 2018-06-18 11:08 ` [PATCH 2/5] net: emaclite: Balance braces in else statement Radhey Shyam Pandey 2018-06-18 11:08 ` Radhey Shyam Pandey
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=644296b273a76469baf641dd712c7a5451cd34fe.camel@perches.com \ --to=joe@perches.com \ --cc=andrew@lunn.ch \ --cc=davem@davemloft.net \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=michal.simek@xilinx.com \ --cc=netdev@vger.kernel.org \ --cc=radhey.shyam.pandey@xilinx.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.