[PATCH v3 net-next 03/13] net: stmmac: reduce indentation when calling stmmac_xpcs_setup
Vladimir Oltean
olteanv at gmail.com
Fri Jun 11 13:05:21 PDT 2021
From: Vladimir Oltean <vladimir.oltean at nxp.com>
There is no reason to embed an if within an if, we can just logically
AND the two conditions.
Signed-off-by: Vladimir Oltean <vladimir.oltean at nxp.com>
Reviewed-by: Wong Vee Khee <vee.khee.wong at linux.intel.com>
---
v2->v3: none
v1->v2: none
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
index db97cd4b871d..975b90805359 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -7003,12 +7003,10 @@ int stmmac_dvr_probe(struct device *device,
if (priv->plat->speed_mode_2500)
priv->plat->speed_mode_2500(ndev, priv->plat->bsp_priv);
- if (priv->plat->mdio_bus_data) {
- if (priv->plat->mdio_bus_data->has_xpcs) {
- ret = stmmac_xpcs_setup(priv->mii);
- if (ret)
- goto error_xpcs_setup;
- }
+ if (priv->plat->mdio_bus_data && priv->plat->mdio_bus_data->has_xpcs) {
+ ret = stmmac_xpcs_setup(priv->mii);
+ if (ret)
+ goto error_xpcs_setup;
}
ret = stmmac_phy_setup(priv);
--
2.25.1
More information about the linux-arm-kernel
mailing list