net: dsa: mv88e6xxx: add port private structure

Add a per-port mv88e6xxx_priv_port structure to store per-port related
data, instead of adding several arrays of DSA_MAX_PORTS elements in the
mv88e6xxx_priv_state structure.

It currently only contains the port STP state.

Signed-off-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/dsa/mv88e6xxx.c b/drivers/net/dsa/mv88e6xxx.c
index 512c8c0be1b4cbf029d4cb0bc692f88e9bf64660..b0e00edb302e3bdeaef19f999b72de3713ded45e 100644 (file)
--- a/drivers/net/dsa/mv88e6xxx.c
+++ b/drivers/net/dsa/mv88e6xxx.c
@@ -1131,7 +1131,7 @@ int mv88e6xxx_port_stp_update(struct dsa_switch *ds, int port, u8 state)
        /* mv88e6xxx_port_stp_update may be called with softirqs disabled,
         * so we can not update the port state directly but need to schedule it.
         */
-       ps->port_state[port] = stp_state;
+       ps->ports[port].state = stp_state;
        set_bit(port, &ps->port_state_update_mask);
        schedule_work(&ps->bridge_work);
 
@@ -1925,7 +1925,7 @@ static void mv88e6xxx_bridge_work(struct work_struct *work)
        while (ps->port_state_update_mask) {
                port = __ffs(ps->port_state_update_mask);
                clear_bit(port, &ps->port_state_update_mask);
-               mv88e6xxx_set_port_state(ds, port, ps->port_state[port]);
+               mv88e6xxx_set_port_state(ds, port, ps->ports[port].state);
        }
 }
 

diff --git a/drivers/net/dsa/mv88e6xxx.h b/drivers/net/dsa/mv88e6xxx.h
index ca08f913d302c8226b4bff5fc546837114893579..63a6f587e9e893aa3f71e1a49c640237a22c994b 100644 (file)
--- a/drivers/net/dsa/mv88e6xxx.h
+++ b/drivers/net/dsa/mv88e6xxx.h
@@ -379,6 +379,10 @@ struct mv88e6xxx_vtu_stu_entry {
        u8      data[DSA_MAX_PORTS];
 };
 
+struct mv88e6xxx_priv_port {
+       u8 state;
+};
+
 struct mv88e6xxx_priv_state {
        /* When using multi-chip addressing, this mutex protects
         * access to the indirect access registers.  (In single-chip
@@ -415,8 +419,9 @@ struct mv88e6xxx_priv_state {
        int             id; /* switch product id */
        int             num_ports;      /* number of switch ports */
 
+       struct mv88e6xxx_priv_port      ports[DSA_MAX_PORTS];
+
        unsigned long port_state_update_mask;
-       u8 port_state[DSA_MAX_PORTS];
 
        struct work_struct bridge_work;
 };