Skip to content

Commit

Permalink
net: dsa: microchip: ksz8795: use reg_mib_cnt where possible
Browse files Browse the repository at this point in the history
The extra define SWITCH_COUNTER_NUM is a copy of the KSZ8795_COUNTER_NUM
define. This patch initializes reg_mib_cnt with KSZ8795_COUNTER_NUM,
makes use of reg_mib_cnt everywhere instead and removes the extra
define.

Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: Michael Grzeschik <m.grzeschik@pengutronix.de>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
  • Loading branch information
Michael Grzeschik authored and Jakub Kicinski committed Dec 3, 2020
1 parent 7fc32b4 commit 31b62c7
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
6 changes: 3 additions & 3 deletions drivers/net/dsa/microchip/ksz8795.c
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ static void ksz8795_r_mib_cnt(struct ksz_device *dev, int port, u16 addr,
u8 check;
int loop;

ctrl_addr = addr + SWITCH_COUNTER_NUM * port;
ctrl_addr = addr + dev->reg_mib_cnt * port;
ctrl_addr |= IND_ACC_TABLE(TABLE_MIB | TABLE_READ);

mutex_lock(&dev->alu_mutex);
Expand Down Expand Up @@ -156,7 +156,7 @@ static void ksz8795_r_mib_pkt(struct ksz_device *dev, int port, u16 addr,
u8 check;
int loop;

addr -= SWITCH_COUNTER_NUM;
addr -= dev->reg_mib_cnt;
ctrl_addr = (KS_MIB_TOTAL_RX_1 - KS_MIB_TOTAL_RX_0) * port;
ctrl_addr += addr + KS_MIB_TOTAL_RX_0;
ctrl_addr |= IND_ACC_TABLE(TABLE_MIB | TABLE_READ);
Expand Down Expand Up @@ -1235,7 +1235,7 @@ static int ksz8795_switch_init(struct ksz_device *dev)
dev->port_mask = BIT(dev->port_cnt) - 1;
dev->port_mask |= dev->host_mask;

dev->reg_mib_cnt = SWITCH_COUNTER_NUM;
dev->reg_mib_cnt = KSZ8795_COUNTER_NUM;
dev->mib_cnt = TOTAL_SWITCH_COUNTER_NUM;

dev->mib_port_cnt = TOTAL_PORT_NUM;
Expand Down
1 change: 0 additions & 1 deletion drivers/net/dsa/microchip/ksz8795_reg.h
Original file line number Diff line number Diff line change
Expand Up @@ -854,7 +854,6 @@
#define KSZ8795_COUNTER_NUM 0x20
#define TOTAL_KSZ8795_COUNTER_NUM (KSZ8795_COUNTER_NUM + 4)

#define SWITCH_COUNTER_NUM KSZ8795_COUNTER_NUM
#define TOTAL_SWITCH_COUNTER_NUM TOTAL_KSZ8795_COUNTER_NUM

/* Common names used by other drivers */
Expand Down

0 comments on commit 31b62c7

Please sign in to comment.