diff options
Diffstat (limited to 'drivers/net/ethernet/mscc/ocelot_ace.c')
| -rw-r--r-- | drivers/net/ethernet/mscc/ocelot_ace.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/ethernet/mscc/ocelot_ace.c b/drivers/net/ethernet/mscc/ocelot_ace.c index 34d8260b8cb8..39aca1ab4687 100644 --- a/drivers/net/ethernet/mscc/ocelot_ace.c +++ b/drivers/net/ethernet/mscc/ocelot_ace.c @@ -93,7 +93,7 @@ struct vcap_data { u32 counter_offset; /* Current counter offset */ u32 tg_value; /* Current type-group value */ u32 tg_mask; /* Current type-group mask */ -} vcap_data_t; +}; static u32 vcap_s2_read_update_ctrl(struct ocelot *oc) { @@ -105,7 +105,6 @@ static void vcap_cmd(struct ocelot *oc, u16 ix, int cmd, int sel) u32 value = (S2_CORE_UPDATE_CTRL_UPDATE_CMD(cmd) | S2_CORE_UPDATE_CTRL_UPDATE_ADDR(ix) | S2_CORE_UPDATE_CTRL_UPDATE_SHOT); - int rc; if ((sel & VCAP_SEL_ENTRY) && ix >= vcap_is2.entry_count) return; @@ -120,7 +119,7 @@ static void vcap_cmd(struct ocelot *oc, u16 ix, int cmd, int sel) value |= S2_CORE_UPDATE_CTRL_UPDATE_CNT_DIS; ocelot_write(oc, value, S2_CORE_UPDATE_CTRL); - rc = readx_poll_timeout(vcap_s2_read_update_ctrl, oc, value, + readx_poll_timeout(vcap_s2_read_update_ctrl, oc, value, (value & S2_CORE_UPDATE_CTRL_UPDATE_SHOT) == 0, 10, 100000); } |