diff options
| author |   Andrew Lunn <andrew@lunn.ch> | 2019-04-27 19:32:59 +0200 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2019-04-27 20:23:04 -0400 |
| commit | 1ba22bf547a3c92d3e6c5c8d3e3ebe48a7bc26b3 (patch) | |
| tree | a107bd7eb2f574134373ea062d8924bd49a8f9f8 /drivers/net/dsa/mv88e6060.c | |
| parent | net: dsa: mv88e6060: Replace REG_WRITE macro (diff) | |
| download | linux-dev-1ba22bf547a3c92d3e6c5c8d3e3ebe48a7bc26b3.tar.xz linux-dev-1ba22bf547a3c92d3e6c5c8d3e3ebe48a7bc26b3.zip | |
net: dsa: mv88e6060: Replace REG_READ macro
The REG_READ macro contains a return statement, making it not very
safe. Remove it by inlining the code.
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/dsa/mv88e6060.c')
| -rw-r--r-- | drivers/net/dsa/mv88e6060.c | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/drivers/net/dsa/mv88e6060.c b/drivers/net/dsa/mv88e6060.c index 68d33c42ce5f..4ca06b3b9d4f 100644 --- a/drivers/net/dsa/mv88e6060.c +++ b/drivers/net/dsa/mv88e6060.c @@ -19,17 +19,6 @@ static int reg_read(struct mv88e6060_priv *priv, int addr, int reg) return mdiobus_read_nested(priv->bus, priv->sw_addr + addr, reg); } -#define REG_READ(addr, reg) \ - ({ \ - int __ret; \ - \ - __ret = reg_read(priv, addr, reg); \ - if (__ret < 0) \ - return __ret; \ - __ret; \ - }) - - static int reg_write(struct mv88e6060_priv *priv, int addr, int reg, u16 val) { return mdiobus_write_nested(priv->bus, priv->sw_addr + addr, reg, val); @@ -88,7 +77,9 @@ static int mv88e6060_switch_reset(struct mv88e6060_priv *priv) /* Set all ports to the disabled state. */ for (i = 0; i < MV88E6060_PORTS; i++) { - ret = REG_READ(REG_PORT(i), PORT_CONTROL); + ret = reg_read(priv, REG_PORT(i), PORT_CONTROL); + if (ret < 0) + return ret; ret = reg_write(priv, REG_PORT(i), PORT_CONTROL, ret & ~PORT_CONTROL_STATE_MASK); if (ret) @@ -108,7 +99,10 @@ static int mv88e6060_switch_reset(struct mv88e6060_priv *priv) /* Wait up to one second for reset to complete. */ timeout = jiffies + 1 * HZ; while (time_before(jiffies, timeout)) { - ret = REG_READ(REG_GLOBAL, GLOBAL_STATUS); + ret = reg_read(priv, REG_GLOBAL, GLOBAL_STATUS); + if (ret < 0) + return ret; + if (ret & GLOBAL_STATUS_INIT_READY) break; |