diff options
| author | Srinivas Kandagatla <srinivas.kandagatla@st.com> | 2012-04-02 06:25:24 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-04-03 19:02:00 -0400 |
| commit | cc90cb3b2429a0f0681331fa5c501f91eee4f633 (patch) | |
| tree | 72389fd02882c4fcb2bd1e83273f818b91d89e33 | |
| parent | 8bc47ec6efd4d447f3502d9f9d41fe440cd5854d (diff) | |
| download | linux-3.10-cc90cb3b2429a0f0681331fa5c501f91eee4f633.tar.gz linux-3.10-cc90cb3b2429a0f0681331fa5c501f91eee4f633.tar.bz2 linux-3.10-cc90cb3b2429a0f0681331fa5c501f91eee4f633.zip | |
net:phy:marvell: remove unnecessary code
Compile tested.
remove unnecessary code that matches this coccinelle pattern
ret = phy_write(x, y , z)
if (ret < 0)
return ret;
return 0;
As phy_write returns error code, we dont need to do not need extra check
before returning.
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@st.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/phy/marvell.c | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/drivers/net/phy/marvell.c b/drivers/net/phy/marvell.c index e8b9c53c304..418928d644b 100644 --- a/drivers/net/phy/marvell.c +++ b/drivers/net/phy/marvell.c @@ -455,11 +455,7 @@ static int m88e1111_config_init(struct phy_device *phydev) if (err < 0) return err; - err = phy_write(phydev, MII_BMCR, BMCR_RESET); - if (err < 0) - return err; - - return 0; + return phy_write(phydev, MII_BMCR, BMCR_RESET); } static int m88e1118_config_aneg(struct phy_device *phydev) @@ -515,11 +511,7 @@ static int m88e1118_config_init(struct phy_device *phydev) if (err < 0) return err; - err = phy_write(phydev, MII_BMCR, BMCR_RESET); - if (err < 0) - return err; - - return 0; + return phy_write(phydev, MII_BMCR, BMCR_RESET); } static int m88e1149_config_init(struct phy_device *phydev) @@ -545,11 +537,7 @@ static int m88e1149_config_init(struct phy_device *phydev) if (err < 0) return err; - err = phy_write(phydev, MII_BMCR, BMCR_RESET); - if (err < 0) - return err; - - return 0; + return phy_write(phydev, MII_BMCR, BMCR_RESET); } static int m88e1145_config_init(struct phy_device *phydev) |