diff options
| author | Joe Hershberger <joe.hershberger@ni.com> | 2016-08-08 11:28:40 -0500 |
|---|---|---|
| committer | Joe Hershberger <joe.hershberger@ni.com> | 2016-08-15 15:29:03 -0500 |
| commit | 875e0bc68a53653aceae33cd92cbb29a8b82471c (patch) | |
| tree | 4c4fcb4316bccd34fe4b63cc02e7ccb6b7d17c51 /drivers/net/davinci_emac.c | |
| parent | 5a49f17481bb9dcab1431c663d35cc1cace16825 (diff) | |
net: mii: Fix changes made by spatch
Some of the changes were a bit too complex.
Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
Diffstat (limited to 'drivers/net/davinci_emac.c')
| -rw-r--r-- | drivers/net/davinci_emac.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/net/davinci_emac.c b/drivers/net/davinci_emac.c index 7eda93fe83..ca457b85d2 100644 --- a/drivers/net/davinci_emac.c +++ b/drivers/net/davinci_emac.c @@ -243,11 +243,10 @@ int davinci_eth_phy_read(u_int8_t phy_addr, u_int8_t reg_num, u_int16_t *data) if (tmp & MDIO_USERACCESS0_ACK) { *data = tmp & 0xffff; - return(1); + return 0; } - *data = -1; - return(0); + return -EIO; } /* Write to a PHY register via MDIO inteface. Blocks until operation is complete. */ @@ -268,7 +267,7 @@ int davinci_eth_phy_write(u_int8_t phy_addr, u_int8_t reg_num, u_int16_t data) while (readl(&adap_mdio->USERACCESS0) & MDIO_USERACCESS0_GO) ; - return(1); + return 0; } /* PHY functions for a generic PHY */ @@ -394,7 +393,7 @@ static int davinci_mii_phy_read(struct mii_dev *bus, int addr, int devad, int reg) { unsigned short value = 0; - int retval = (davinci_eth_phy_read(addr, reg, &value) ? 0 : 1); + int retval = davinci_eth_phy_read(addr, reg, &value); if (retval < 0) return retval; return value; @@ -403,7 +402,7 @@ static int davinci_mii_phy_read(struct mii_dev *bus, int addr, int devad, static int davinci_mii_phy_write(struct mii_dev *bus, int addr, int devad, int reg, u16 value) { - return(davinci_eth_phy_write(addr, reg, value) ? 0 : 1); + return davinci_eth_phy_write(addr, reg, value); } #endif |