Commit b325159d authored by Alvin Šipraga's avatar Alvin Šipraga Committed by Jakub Kicinski

net: dsa: realtek: rtl8365mb: remove port_mask private data member

There is no real need for this variable: the line change interrupt mask
is sufficiently masked out when getting linkup_ind and linkdown_ind in
the interrupt handler.
Signed-off-by: default avatarAlvin Šipraga <alsi@bang-olufsen.dk>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 5eb1a238
...@@ -564,7 +564,6 @@ struct rtl8365mb_port { ...@@ -564,7 +564,6 @@ struct rtl8365mb_port {
* @irq: registered IRQ or zero * @irq: registered IRQ or zero
* @chip_id: chip identifier * @chip_id: chip identifier
* @chip_ver: chip silicon revision * @chip_ver: chip silicon revision
* @port_mask: mask of all ports
* @learn_limit_max: maximum number of L2 addresses the chip can learn * @learn_limit_max: maximum number of L2 addresses the chip can learn
* @cpu: CPU tagging and CPU port configuration for this chip * @cpu: CPU tagging and CPU port configuration for this chip
* @mib_lock: prevent concurrent reads of MIB counters * @mib_lock: prevent concurrent reads of MIB counters
...@@ -579,7 +578,6 @@ struct rtl8365mb { ...@@ -579,7 +578,6 @@ struct rtl8365mb {
int irq; int irq;
u32 chip_id; u32 chip_id;
u32 chip_ver; u32 chip_ver;
u32 port_mask;
u32 learn_limit_max; u32 learn_limit_max;
struct rtl8365mb_cpu cpu; struct rtl8365mb_cpu cpu;
struct mutex mib_lock; struct mutex mib_lock;
...@@ -1489,13 +1487,10 @@ static irqreturn_t rtl8365mb_irq(int irq, void *data) ...@@ -1489,13 +1487,10 @@ static irqreturn_t rtl8365mb_irq(int irq, void *data)
{ {
struct realtek_priv *priv = data; struct realtek_priv *priv = data;
unsigned long line_changes = 0; unsigned long line_changes = 0;
struct rtl8365mb *mb;
u32 stat; u32 stat;
int line; int line;
int ret; int ret;
mb = priv->chip_data;
ret = rtl8365mb_get_and_clear_status_reg(priv, RTL8365MB_INTR_STATUS_REG, ret = rtl8365mb_get_and_clear_status_reg(priv, RTL8365MB_INTR_STATUS_REG,
&stat); &stat);
if (ret) if (ret)
...@@ -1520,7 +1515,7 @@ static irqreturn_t rtl8365mb_irq(int irq, void *data) ...@@ -1520,7 +1515,7 @@ static irqreturn_t rtl8365mb_irq(int irq, void *data)
linkdown_ind = FIELD_GET(RTL8365MB_PORT_LINKDOWN_IND_MASK, val); linkdown_ind = FIELD_GET(RTL8365MB_PORT_LINKDOWN_IND_MASK, val);
line_changes = (linkup_ind | linkdown_ind) & mb->port_mask; line_changes = linkup_ind | linkdown_ind;
} }
if (!line_changes) if (!line_changes)
...@@ -2009,7 +2004,6 @@ static int rtl8365mb_detect(struct realtek_priv *priv) ...@@ -2009,7 +2004,6 @@ static int rtl8365mb_detect(struct realtek_priv *priv)
mb->priv = priv; mb->priv = priv;
mb->chip_id = chip_id; mb->chip_id = chip_id;
mb->chip_ver = chip_ver; mb->chip_ver = chip_ver;
mb->port_mask = GENMASK(priv->num_ports - 1, 0);
mb->learn_limit_max = RTL8365MB_LEARN_LIMIT_MAX; mb->learn_limit_max = RTL8365MB_LEARN_LIMIT_MAX;
mb->jam_table = rtl8365mb_init_jam_8365mb_vc; mb->jam_table = rtl8365mb_init_jam_8365mb_vc;
mb->jam_size = ARRAY_SIZE(rtl8365mb_init_jam_8365mb_vc); mb->jam_size = ARRAY_SIZE(rtl8365mb_init_jam_8365mb_vc);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment