[PATCH 1/3] ocelot_ace: drop member port from ocelot_ace_rule structure

[Yangbo Lu]

The ocelot_ace_rule is not port specific. We don't need a member port
in ocelot_ace_rule structure. Drop it and use member ocelot instead.

Signed-off-by: Yangbo Lu <yangbo...@nxp.com>
---
 drivers/net/ethernet/mscc/ocelot_ace.c    | 12 ++++++------
 drivers/net/ethernet/mscc/ocelot_ace.h    |  2 +-
 drivers/net/ethernet/mscc/ocelot_flower.c |  6 +++---
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/drivers/net/ethernet/mscc/ocelot_ace.c 
b/drivers/net/ethernet/mscc/ocelot_ace.c
index 39aca1a..5580a58 100644
--- a/drivers/net/ethernet/mscc/ocelot_ace.c
+++ b/drivers/net/ethernet/mscc/ocelot_ace.c
@@ -576,7 +576,7 @@ static void is2_entry_set(struct ocelot *ocelot, int ix,
 
 static void is2_entry_get(struct ocelot_ace_rule *rule, int ix)
 {
-       struct ocelot *op = rule->port->ocelot;
+       struct ocelot *op = rule->ocelot;
        struct vcap_data data;
        int row = (ix / 2);
        u32 cnt;
@@ -655,11 +655,11 @@ int ocelot_ace_rule_offload_add(struct ocelot_ace_rule 
*rule)
        /* Move down the rules to make place for the new rule */
        for (i = acl_block->count - 1; i > index; i--) {
                ace = ocelot_ace_rule_get_rule_index(acl_block, i);
-               is2_entry_set(rule->port->ocelot, i, ace);
+               is2_entry_set(rule->ocelot, i, ace);
        }
 
        /* Now insert the new rule */
-       is2_entry_set(rule->port->ocelot, index, rule);
+       is2_entry_set(rule->ocelot, index, rule);
        return 0;
 }
 
@@ -697,11 +697,11 @@ int ocelot_ace_rule_offload_del(struct ocelot_ace_rule 
*rule)
        /* Move up all the blocks over the deleted rule */
        for (i = index; i < acl_block->count; i++) {
                ace = ocelot_ace_rule_get_rule_index(acl_block, i);
-               is2_entry_set(rule->port->ocelot, i, ace);
+               is2_entry_set(rule->ocelot, i, ace);
        }
 
        /* Now delete the last rule, because it is duplicated */
-       is2_entry_set(rule->port->ocelot, acl_block->count, &del_ace);
+       is2_entry_set(rule->ocelot, acl_block->count, &del_ace);
 
        return 0;
 }
@@ -717,7 +717,7 @@ int ocelot_ace_rule_stats_update(struct ocelot_ace_rule 
*rule)
        /* After we get the result we need to clear the counters */
        tmp = ocelot_ace_rule_get_rule_index(acl_block, index);
        tmp->stats.pkts = 0;
-       is2_entry_set(rule->port->ocelot, index, tmp);
+       is2_entry_set(rule->ocelot, index, tmp);
 
        return 0;
 }
diff --git a/drivers/net/ethernet/mscc/ocelot_ace.h 
b/drivers/net/ethernet/mscc/ocelot_ace.h
index e98944c..ce72f02 100644
--- a/drivers/net/ethernet/mscc/ocelot_ace.h
+++ b/drivers/net/ethernet/mscc/ocelot_ace.h
@@ -186,7 +186,7 @@ struct ocelot_ace_stats {
 
 struct ocelot_ace_rule {
        struct list_head list;
-       struct ocelot_port *port;
+       struct ocelot *ocelot;
 
        u16 prio;
        u32 id;
diff --git a/drivers/net/ethernet/mscc/ocelot_flower.c 
b/drivers/net/ethernet/mscc/ocelot_flower.c
index 59487d4..7c60e8c 100644
--- a/drivers/net/ethernet/mscc/ocelot_flower.c
+++ b/drivers/net/ethernet/mscc/ocelot_flower.c
@@ -183,7 +183,7 @@ struct ocelot_ace_rule *ocelot_ace_rule_create(struct 
flow_cls_offload *f,
        if (!rule)
                return NULL;
 
-       rule->port = block->port;
+       rule->ocelot = block->port->ocelot;
        rule->chip_port = block->port->chip_port;
        return rule;
 }
@@ -219,7 +219,7 @@ static int ocelot_flower_destroy(struct flow_cls_offload *f,
        int ret;
 
        rule.prio = get_prio(f->common.prio);
-       rule.port = port_block->port;
+       rule.ocelot = port_block->port->ocelot;
        rule.id = f->cookie;
 
        ret = ocelot_ace_rule_offload_del(&rule);
@@ -237,7 +237,7 @@ static int ocelot_flower_stats_update(struct 
flow_cls_offload *f,
        int ret;
 
        rule.prio = get_prio(f->common.prio);
-       rule.port = port_block->port;
+       rule.ocelot = port_block->port->ocelot;
        rule.id = f->cookie;
        ret = ocelot_ace_rule_stats_update(&rule);
        if (ret)
-- 
2.7.4