net: dsa: felix: use ocelot_field_{read,write} helpers consistently

Since these helpers for regmap fields are available, use them.

Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/dsa/ocelot/felix_vsc9959.c b/drivers/net/dsa/ocelot/felix_vsc9959.c
index 126a53a811f75d44502190b44f64f82c4876464f..397d24c9f7c2a67419d2cea21b99234269243e90 100644 (file)
--- a/drivers/net/dsa/ocelot/felix_vsc9959.c
+++ b/drivers/net/dsa/ocelot/felix_vsc9959.c
@@ -727,7 +727,7 @@ static int vsc9959_gcb_soft_rst_status(struct ocelot *ocelot)
 {
        int val;
 
-       regmap_field_read(ocelot->regfields[GCB_SOFT_RST_SWC_RST], &val);
+       ocelot_field_read(ocelot, GCB_SOFT_RST_SWC_RST, &val);
 
        return val;
 }
@@ -742,7 +742,7 @@ static int vsc9959_reset(struct ocelot *ocelot)
        int val, err;
 
        /* soft-reset the switch core */
-       regmap_field_write(ocelot->regfields[GCB_SOFT_RST_SWC_RST], 1);
+       ocelot_field_write(ocelot, GCB_SOFT_RST_SWC_RST, 1);
 
        err = readx_poll_timeout(vsc9959_gcb_soft_rst_status, ocelot, val, !val,
                                 VSC9959_GCB_RST_SLEEP, VSC9959_INIT_TIMEOUT);
@@ -762,7 +762,7 @@ static int vsc9959_reset(struct ocelot *ocelot)
        }
 
        /* enable switch core */
-       regmap_field_write(ocelot->regfields[SYS_RESET_CFG_CORE_ENA], 1);
+       ocelot_field_write(ocelot, SYS_RESET_CFG_CORE_ENA, 1);
 
        return 0;
 }