Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e69d9ed4 authored by Andrew Lunn's avatar Andrew Lunn Committed by David S. Miller
Browse files

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



Remove the extra blank lines, add one in where recommended.

Signed-off-by: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 0c3439bc

drivers/net/phy/marvell.c

+2 −3
Original line number Diff line number Diff line
@@ -420,7 +420,6 @@ static int marvell_of_reg_init(struct phy_device *phydev) 
		ret = phy_write(phydev, reg, val);

		if (ret < 0)

			goto err;



	}

err:

	if (current_page != saved_page) {
@@ -449,7 +448,6 @@ static int m88e1121_config_aneg(struct phy_device *phydev) 
		return err;



	if (phy_interface_is_rgmii(phydev)) {



		mscr = phy_read(phydev, MII_88E1121_PHY_MSCR_REG) &

			MII_88E1121_PHY_MSCR_DELAY_MASK;
@@ -703,7 +701,6 @@ static int m88e1111_config_init(struct phy_device *phydev) 
	int temp;



	if (phy_interface_is_rgmii(phydev)) {



		temp = phy_read(phydev, MII_M1111_PHY_EXT_CR);

		if (temp < 0)

			return temp;
@@ -968,6 +965,7 @@ static int m88e1145_config_init(struct phy_device *phydev) 


	if (phydev->interface == PHY_INTERFACE_MODE_RGMII_ID) {

		int temp = phy_read(phydev, MII_M1145_PHY_EXT_CR);



		if (temp < 0)

			return temp;
@@ -1312,6 +1310,7 @@ static int marvell_resume(struct phy_device *phydev) 
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);

}