leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

net: phy: marvell: Checkpatch - Missing or extra blank lines

Browse Source 
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>
This commit is contained in:
Andrew Lunn 2017-05-17 03:26:00 +02:00 committed by David S. Miller
parent 0c3439bc77
commit e69d9ed4fa
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/net/phy/marvell.c
View File

@ -420,7 +420,6 @@ static int marvell_of_reg_init(struct phy_device *phydev)
ret = phy_write(phydev, reg, val); ret = phy_write(phydev, reg, val);
if (ret < 0) if (ret < 0)
goto err; goto err;
} }
err: err:
if (current_page != saved_page) { if (current_page != saved_page) {
@ -449,7 +448,6 @@ static int m88e1121_config_aneg(struct phy_device *phydev)
return err; return err;
if (phy_interface_is_rgmii(phydev)) { if (phy_interface_is_rgmii(phydev)) {
mscr = phy_read(phydev, MII_88E1121_PHY_MSCR_REG) & mscr = phy_read(phydev, MII_88E1121_PHY_MSCR_REG) &
MII_88E1121_PHY_MSCR_DELAY_MASK; MII_88E1121_PHY_MSCR_DELAY_MASK;
@ -703,7 +701,6 @@ static int m88e1111_config_init(struct phy_device *phydev)
int temp; int temp;
if (phy_interface_is_rgmii(phydev)) { if (phy_interface_is_rgmii(phydev)) {
temp = phy_read(phydev, MII_M1111_PHY_EXT_CR); temp = phy_read(phydev, MII_M1111_PHY_EXT_CR);
if (temp < 0) if (temp < 0)
return temp; return temp;
@ -968,6 +965,7 @@ static int m88e1145_config_init(struct phy_device *phydev)
if (phydev->interface == PHY_INTERFACE_MODE_RGMII_ID) { if (phydev->interface == PHY_INTERFACE_MODE_RGMII_ID) {
int temp = phy_read(phydev, MII_M1145_PHY_EXT_CR); int temp = phy_read(phydev, MII_M1145_PHY_EXT_CR);
if (temp < 0) if (temp < 0)
return temp; return temp;
@ -1312,6 +1310,7 @@ error:
static int marvell_aneg_done(struct phy_device *phydev) static int marvell_aneg_done(struct phy_device *phydev)
{ {
int retval = phy_read(phydev, MII_M1011_PHY_STATUS); int retval = phy_read(phydev, MII_M1011_PHY_STATUS);
return (retval < 0) ? retval : (retval & MII_M1011_PHY_STATUS_RESOLVED); return (retval < 0) ? retval : (retval & MII_M1011_PHY_STATUS_RESOLVED);
} }