[PATCH RFC RFT net-next 04/10] net: dsa: mv88e6060: Replace REG_READ macro

[Andrew Lunn]

The REG_READ macro contains a return statement, making it not very
safe. Remove it by inlining the code.

Signed-off-by: Andrew Lunn <and...@lunn.ch>
---
 drivers/net/dsa/mv88e6060.c | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/drivers/net/dsa/mv88e6060.c b/drivers/net/dsa/mv88e6060.c
index da88c56e092c..00fdf155dcec 100644
--- a/drivers/net/dsa/mv88e6060.c
+++ b/drivers/net/dsa/mv88e6060.c
@@ -23,17 +23,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);
@@ -92,7 +81,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)
@@ -112,7 +103,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;
 
-- 
2.20.1