[PATCH v4 04/11] net: dsa: microchip: ksz8795: use port_cnt where possible

[Michael Grzeschik]

Since the driver can be used on more switches it needs
to use flexible port count whereever possible.

Signed-off-by: Michael Grzeschik <m.grzesc...@pengutronix.de>

---
v1 -> v4: - extracted this change from bigger previous patch

 drivers/net/dsa/microchip/ksz8795.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/drivers/net/dsa/microchip/ksz8795.c 
b/drivers/net/dsa/microchip/ksz8795.c
index 8f1d15ea15d9a75..947ea1e45f5b2c6 100644
--- a/drivers/net/dsa/microchip/ksz8795.c
+++ b/drivers/net/dsa/microchip/ksz8795.c
@@ -418,8 +418,8 @@ static void ksz8795_r_vlan_entries(struct ksz_device *dev, 
u16 addr)
        int i;
 
        ksz8795_r_table(dev, TABLE_VLAN, addr, &data);
-       addr *= 4;
-       for (i = 0; i < 4; i++) {
+       addr *= dev->port_cnt;
+       for (i = 0; i < dev->port_cnt; i++) {
                dev->vlan_cache[addr + i].table[0] = (u16)data;
                data >>= VLAN_TABLE_S;
        }
@@ -433,7 +433,7 @@ static void ksz8795_r_vlan_table(struct ksz_device *dev, 
u16 vid, u16 *vlan)
        u64 buf;
 
        data = (u16 *)&buf;
-       addr = vid / 4;
+       addr = vid / dev->port_cnt;
        index = vid & 3;
        ksz8795_r_table(dev, TABLE_VLAN, addr, &buf);
        *vlan = data[index];
@@ -447,7 +447,7 @@ static void ksz8795_w_vlan_table(struct ksz_device *dev, 
u16 vid, u16 vlan)
        u64 buf;
 
        data = (u16 *)&buf;
-       addr = vid / 4;
+       addr = vid / dev->port_cnt;
        index = vid & 3;
        ksz8795_r_table(dev, TABLE_VLAN, addr, &buf);
        data[index] = vlan;
@@ -691,12 +691,12 @@ static void ksz8795_port_stp_state_set(struct dsa_switch 
*ds, int port,
        switch (state) {
        case BR_STATE_DISABLED:
                data |= PORT_LEARN_DISABLE;
-               if (port < SWITCH_PORT_NUM)
+               if (port < dev->port_cnt)
                        member = 0;
                break;
        case BR_STATE_LISTENING:
                data |= (PORT_RX_ENABLE | PORT_LEARN_DISABLE);
-               if (port < SWITCH_PORT_NUM &&
+               if (port < dev->port_cnt &&
                    p->stp_state == BR_STATE_DISABLED)
                        member = dev->host_mask | p->vid_member;
                break;
@@ -720,7 +720,7 @@ static void ksz8795_port_stp_state_set(struct dsa_switch 
*ds, int port,
                break;
        case BR_STATE_BLOCKING:
                data |= PORT_LEARN_DISABLE;
-               if (port < SWITCH_PORT_NUM &&
+               if (port < dev->port_cnt &&
                    p->stp_state == BR_STATE_DISABLED)
                        member = dev->host_mask | p->vid_member;
                break;
@@ -993,7 +993,7 @@ static void ksz8795_config_cpu_port(struct dsa_switch *ds)
        ksz8795_port_setup(dev, dev->cpu_port, true);
        dev->member = dev->host_mask;
 
-       for (i = 0; i < SWITCH_PORT_NUM; i++) {
+       for (i = 0; i < dev->port_cnt; i++) {
                p = &dev->ports[i];
 
                /* Initialize to non-zero so that ksz_cfg_port_member() will
-- 
2.28.0