kernel: backport b53/bcm_sf2 changes from v5.8
[openwrt/openwrt.git] / target / linux / generic / backport-5.4 / 709-v5.8-0005-net-dsa-b53-Remove-is_static-argument-to-b53_read_op.patch
1 From ef2a0bd99b1549a3a4253355be247d5dff25d720 Mon Sep 17 00:00:00 2001
2 From: Florian Fainelli <f.fainelli@gmail.com>
3 Date: Thu, 30 Apr 2020 11:49:11 -0700
4 Subject: [PATCH] net: dsa: b53: Remove is_static argument to b53_read_op()
5
6 This argument is not used.
7
8 Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
9 Reviewed-by: Andrew Lunn <andrew@lunn.ch>
10 Signed-off-by: David S. Miller <davem@davemloft.net>
11 ---
12 drivers/net/dsa/b53/b53_common.c | 6 +++---
13 1 file changed, 3 insertions(+), 3 deletions(-)
14
15 --- a/drivers/net/dsa/b53/b53_common.c
16 +++ b/drivers/net/dsa/b53/b53_common.c
17 @@ -1495,8 +1495,7 @@ static int b53_arl_rw_op(struct b53_devi
18 }
19
20 static int b53_arl_read(struct b53_device *dev, u64 mac,
21 - u16 vid, struct b53_arl_entry *ent, u8 *idx,
22 - bool is_valid)
23 + u16 vid, struct b53_arl_entry *ent, u8 *idx)
24 {
25 DECLARE_BITMAP(free_bins, B53_ARLTBL_MAX_BIN_ENTRIES);
26 unsigned int i;
27 @@ -1561,7 +1560,8 @@ static int b53_arl_op(struct b53_device
28 if (ret)
29 return ret;
30
31 - ret = b53_arl_read(dev, mac, vid, &ent, &idx, is_valid);
32 + ret = b53_arl_read(dev, mac, vid, &ent, &idx);
33 +
34 /* If this is a read, just finish now */
35 if (op)
36 return ret;