* [1/2] net/usb/ax88179_178a: Use common code in ax88179_chk_eee()
@ 2018-03-10 18:24 SF Markus Elfring
0 siblings, 0 replies; 3+ messages in thread
From: SF Markus Elfring @ 2018-03-10 18:24 UTC (permalink / raw)
To: linux-usb, netdev, Andrew F. Davis, Bjørn Mork,
David S. Miller, Philippe Reynes, Yuval Shaia
Cc: LKML, kernel-janitors
From: Markus Elfring <elfring@users.sourceforge.net>
Date: Sat, 10 Mar 2018 18:22:43 +0100
Adjust a jump target so that a bit of common code can be better reused
at the end of this function.
This issue was detected by using the Coccinelle software.
Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
---
drivers/net/usb/ax88179_178a.c | 34 +++++++++++-----------------------
1 file changed, 11 insertions(+), 23 deletions(-)
diff --git a/drivers/net/usb/ax88179_178a.c b/drivers/net/usb/ax88179_178a.c
index f32261ecd215..e4b0baa98e9a 100644
--- a/drivers/net/usb/ax88179_178a.c
+++ b/drivers/net/usb/ax88179_178a.c
@@ -689,49 +689,37 @@ static int ax88179_chk_eee(struct usbnet *dev)
eee_cap = ax88179_phy_read_mmd_indirect(dev,
MDIO_PCS_EEE_ABLE,
MDIO_MMD_PCS);
- if (eee_cap < 0) {
- priv->eee_active = 0;
- return false;
- }
+ if (eee_cap < 0)
+ goto set_inactive;
cap = mmd_eee_cap_to_ethtool_sup_t(eee_cap);
- if (!cap) {
- priv->eee_active = 0;
- return false;
- }
+ if (!cap)
+ goto set_inactive;
eee_lp = ax88179_phy_read_mmd_indirect(dev,
MDIO_AN_EEE_LPABLE,
MDIO_MMD_AN);
- if (eee_lp < 0) {
- priv->eee_active = 0;
- return false;
- }
+ if (eee_lp < 0)
+ goto set_inactive;
eee_adv = ax88179_phy_read_mmd_indirect(dev,
MDIO_AN_EEE_ADV,
MDIO_MMD_AN);
-
- if (eee_adv < 0) {
- priv->eee_active = 0;
- return false;
- }
+ if (eee_adv < 0)
+ goto set_inactive;
adv = mmd_eee_adv_to_ethtool_adv_t(eee_adv);
lp = mmd_eee_adv_to_ethtool_adv_t(eee_lp);
supported = (ecmd.speed == SPEED_1000) ?
SUPPORTED_1000baseT_Full :
SUPPORTED_100baseT_Full;
-
- if (!(lp & adv & supported)) {
- priv->eee_active = 0;
- return false;
- }
+ if (!(lp & adv & supported))
+ goto set_inactive;
priv->eee_active = 1;
return true;
}
-
+set_inactive:
priv->eee_active = 0;
return false;
}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [1/2] net/usb/ax88179_178a: Use common code in ax88179_chk_eee()
@ 2018-03-10 18:41 Joe Perches
0 siblings, 0 replies; 3+ messages in thread
From: Joe Perches @ 2018-03-10 18:41 UTC (permalink / raw)
To: SF Markus Elfring, linux-usb, netdev, Andrew F. Davis,
Bjørn Mork, David S. Miller, Philippe Reynes, Yuval Shaia
Cc: LKML, kernel-janitors
On Sat, 2018-03-10 at 19:24 +0100, SF Markus Elfring wrote:
> From: Markus Elfring <elfring@users.sourceforge.net>
> Date: Sat, 10 Mar 2018 18:22:43 +0100
>
> Adjust a jump target so that a bit of common code can be better reused
> at the end of this function.
Please stop mindlessly sending patching Markus.
How about looking at the code being modified and
thinking about what it does?
Try unindenting the block by reversing the first test
and using the same goto set_inactive.
Look at the last & tests
+ if (!(lp & adv & supported))
and see if it should use && or be more simple to read
by using
if (!condition || !
> ---
> drivers/net/usb/ax88179_178a.c | 34 +++++++++++-----------------------
> 1 file changed, 11 insertions(+), 23 deletions(-)
>
> diff --git a/drivers/net/usb/ax88179_178a.c b/drivers/net/usb/ax88179_178a.c
> index f32261ecd215..e4b0baa98e9a 100644
> --- a/drivers/net/usb/ax88179_178a.c
> +++ b/drivers/net/usb/ax88179_178a.c
> @@ -689,49 +689,37 @@ static int ax88179_chk_eee(struct usbnet *dev)
> eee_cap = ax88179_phy_read_mmd_indirect(dev,
> MDIO_PCS_EEE_ABLE,
> MDIO_MMD_PCS);
> - if (eee_cap < 0) {
> - priv->eee_active = 0;
> - return false;
> - }
> + if (eee_cap < 0)
> + goto set_inactive;
>
> cap = mmd_eee_cap_to_ethtool_sup_t(eee_cap);
> - if (!cap) {
> - priv->eee_active = 0;
> - return false;
> - }
> + if (!cap)
> + goto set_inactive;
>
> eee_lp = ax88179_phy_read_mmd_indirect(dev,
> MDIO_AN_EEE_LPABLE,
> MDIO_MMD_AN);
> - if (eee_lp < 0) {
> - priv->eee_active = 0;
> - return false;
> - }
> + if (eee_lp < 0)
> + goto set_inactive;
>
> eee_adv = ax88179_phy_read_mmd_indirect(dev,
> MDIO_AN_EEE_ADV,
> MDIO_MMD_AN);
> -
> - if (eee_adv < 0) {
> - priv->eee_active = 0;
> - return false;
> - }
> + if (eee_adv < 0)
> + goto set_inactive;
>
> adv = mmd_eee_adv_to_ethtool_adv_t(eee_adv);
> lp = mmd_eee_adv_to_ethtool_adv_t(eee_lp);
> supported = (ecmd.speed == SPEED_1000) ?
> SUPPORTED_1000baseT_Full :
> SUPPORTED_100baseT_Full;
> -
> - if (!(lp & adv & supported)) {
> - priv->eee_active = 0;
> - return false;
> - }
> + if (!(lp & adv & supported))
> + goto set_inactive;
>
> priv->eee_active = 1;
> return true;
> }
> -
> +set_inactive:
> priv->eee_active = 0;
> return false;
> }
---
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 3+ messages in thread
* [1/2] net/usb/ax88179_178a: Use common code in ax88179_chk_eee()
@ 2018-03-10 18:48 Andy Shevchenko
0 siblings, 0 replies; 3+ messages in thread
From: Andy Shevchenko @ 2018-03-10 18:48 UTC (permalink / raw)
To: Joe Perches
Cc: SF Markus Elfring, USB, netdev, Andrew F. Davis, Bjørn Mork,
David S. Miller, Philippe Reynes, Yuval Shaia, LKML,
kernel-janitors
On Sat, Mar 10, 2018 at 8:41 PM, Joe Perches <joe@perches.com> wrote:
> On Sat, 2018-03-10 at 19:24 +0100, SF Markus Elfring wrote:
>> From: Markus Elfring <elfring@users.sourceforge.net>
>> Date: Sat, 10 Mar 2018 18:22:43 +0100
>>
>> Adjust a jump target so that a bit of common code can be better reused
>> at the end of this function.
>
> Please stop mindlessly sending patching Markus.
>
> How about looking at the code being modified and
> thinking about what it does?
You have a strong nerve, I gave up on him and would rather simple ban.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2018-03-10 18:48 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-03-10 18:24 [1/2] net/usb/ax88179_178a: Use common code in ax88179_chk_eee() SF Markus Elfring
-- strict thread matches above, loose matches on Subject: below --
2018-03-10 18:41 Joe Perches
2018-03-10 18:48 Andy Shevchenko
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).