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

Commit b0456b24 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'lxt-cleanups' 



Sergei Shtylyov says:

====================
   Here's the set of 2 patches against DaveM's 'net-next.git' repo. We save
several LoCs on the unneeded local variables....

[1/2] lxt: simplify lxt97[01]_config_intr()
[2/2] lxt: simplify lxt970_config_init()
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 485b7778 c8396d84

drivers/net/phy/lxt.c

+5 −17
Original line number Diff line number Diff line
@@ -80,23 +80,15 @@ static int lxt970_ack_interrupt(struct phy_device *phydev) 


static int lxt970_config_intr(struct phy_device *phydev)

{

	int err;



	if (phydev->interrupts == PHY_INTERRUPT_ENABLED)

		err = phy_write(phydev, MII_LXT970_IER, MII_LXT970_IER_IEN);

		return phy_write(phydev, MII_LXT970_IER, MII_LXT970_IER_IEN);

	else

		err = phy_write(phydev, MII_LXT970_IER, 0);



	return err;

		return phy_write(phydev, MII_LXT970_IER, 0);

}



static int lxt970_config_init(struct phy_device *phydev)

{

	int err;



	err = phy_write(phydev, MII_LXT970_CONFIG, 0);



	return err;

	return phy_write(phydev, MII_LXT970_CONFIG, 0);

}
@@ -112,14 +104,10 @@ static int lxt971_ack_interrupt(struct phy_device *phydev) 


static int lxt971_config_intr(struct phy_device *phydev)

{

	int err;



	if (phydev->interrupts == PHY_INTERRUPT_ENABLED)

		err = phy_write(phydev, MII_LXT971_IER, MII_LXT971_IER_IEN);

		return phy_write(phydev, MII_LXT971_IER, MII_LXT971_IER_IEN);

	else

		err = phy_write(phydev, MII_LXT971_IER, 0);



	return err;

		return phy_write(phydev, MII_LXT971_IER, 0);

}



/*