From: Andrew Lunn <andrew@lunn.ch>
Date: Wed, 17 May 2017 03:26:00 +0200
Subject: net: phy: marvell: Checkpatch - Missing or extra blank lines
Patch-mainline: v4.13-rc1
Git-commit: e69d9ed4faa10a2b8d8e4d7e2b930d972642830b
References: bsc#1119113 FATE#326472
Remove the extra blank lines, add one in where recommended.
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
Acked-by: Thomas Bogendoerfer <tbogendoerfer@suse.de>
---
drivers/net/phy/marvell.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
--- a/drivers/net/phy/marvell.c
+++ b/drivers/net/phy/marvell.c
@@ -428,7 +428,6 @@ static int marvell_of_reg_init(struct ph
ret = phy_write(phydev, reg, val);
if (ret < 0)
goto err;
-
}
err:
if (current_page != saved_page) {
@@ -457,7 +456,6 @@ static int m88e1121_config_aneg(struct p
return err;
if (phy_interface_is_rgmii(phydev)) {
-
mscr = phy_read(phydev, MII_88E1121_PHY_MSCR_REG) &
MII_88E1121_PHY_MSCR_DELAY_MASK;
@@ -711,7 +709,6 @@ static int m88e1111_config_init(struct p
int temp;
if (phy_interface_is_rgmii(phydev)) {
-
temp = phy_read(phydev, MII_M1111_PHY_EXT_CR);
if (temp < 0)
return temp;
@@ -976,6 +973,7 @@ static int m88e1145_config_init(struct p
if (phydev->interface == PHY_INTERFACE_MODE_RGMII_ID) {
int temp = phy_read(phydev, MII_M1145_PHY_EXT_CR);
+
if (temp < 0)
return temp;
@@ -1318,6 +1316,7 @@ error:
static int marvell_aneg_done(struct phy_device *phydev)
{
int retval = phy_read(phydev, MII_M1011_PHY_STATUS);
+
return (retval < 0) ? retval : (retval & MII_M1011_PHY_STATUS_RESOLVED);
}