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

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
...@@ -80,23 +80,15 @@ static int lxt970_ack_interrupt(struct phy_device *phydev) ...@@ -80,23 +80,15 @@ static int lxt970_ack_interrupt(struct phy_device *phydev)
static int lxt970_config_intr(struct phy_device *phydev) static int lxt970_config_intr(struct phy_device *phydev)
{ {
int err;
if (phydev->interrupts == PHY_INTERRUPT_ENABLED) 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 else
err = phy_write(phydev, MII_LXT970_IER, 0); return phy_write(phydev, MII_LXT970_IER, 0);
return err;
} }
static int lxt970_config_init(struct phy_device *phydev) static int lxt970_config_init(struct phy_device *phydev)
{ {
int err; return phy_write(phydev, MII_LXT970_CONFIG, 0);
err = phy_write(phydev, MII_LXT970_CONFIG, 0);
return err;
} }
...@@ -112,14 +104,10 @@ static int lxt971_ack_interrupt(struct phy_device *phydev) ...@@ -112,14 +104,10 @@ static int lxt971_ack_interrupt(struct phy_device *phydev)
static int lxt971_config_intr(struct phy_device *phydev) static int lxt971_config_intr(struct phy_device *phydev)
{ {
int err;
if (phydev->interrupts == PHY_INTERRUPT_ENABLED) 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 else
err = phy_write(phydev, MII_LXT971_IER, 0); return phy_write(phydev, MII_LXT971_IER, 0);
return err;
} }
/* /*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment