| Message ID | 20190807130856.60792-1-yuehaibing@huawei.com |
|---|---|
| State | Accepted |
| Delegated to: | David Miller |
| Headers | show |
| Series | [net-next] net: dsa: sja1105: remove set but not used variables 'tx_vid' and 'rx_vid' | expand |
On Wed, 7 Aug 2019 at 16:09, YueHaibing <yuehaibing@huawei.com> wrote: > > Fixes gcc '-Wunused-but-set-variable' warning: > > drivers/net/dsa/sja1105/sja1105_main.c: In function sja1105_fdb_dump: > drivers/net/dsa/sja1105/sja1105_main.c:1226:14: warning: > variable tx_vid set but not used [-Wunused-but-set-variable] > drivers/net/dsa/sja1105/sja1105_main.c:1226:6: warning: > variable rx_vid set but not used [-Wunused-but-set-variable] > > They are not used since commit 6d7c7d948a2e ("net: dsa: > sja1105: Fix broken learning with vlan_filtering disabled") > > Reported-by: Hulk Robot <hulkci@huawei.com> > Signed-off-by: YueHaibing <yuehaibing@huawei.com> > --- Reviewed-by: Vladimir Oltean <olteanv@gmail.com> > drivers/net/dsa/sja1105/sja1105_main.c | 4 ---- > 1 file changed, 4 deletions(-) > > diff --git a/drivers/net/dsa/sja1105/sja1105_main.c b/drivers/net/dsa/sja1105/sja1105_main.c > index d073baf..df976b25 100644 > --- a/drivers/net/dsa/sja1105/sja1105_main.c > +++ b/drivers/net/dsa/sja1105/sja1105_main.c > @@ -1223,12 +1223,8 @@ static int sja1105_fdb_dump(struct dsa_switch *ds, int port, > { > struct sja1105_private *priv = ds->priv; > struct device *dev = ds->dev; > - u16 rx_vid, tx_vid; > int i; > > - rx_vid = dsa_8021q_rx_vid(ds, port); > - tx_vid = dsa_8021q_tx_vid(ds, port); > - > for (i = 0; i < SJA1105_MAX_L2_LOOKUP_COUNT; i++) { > struct sja1105_l2_lookup_entry l2_lookup = {0}; > u8 macaddr[ETH_ALEN]; > -- > 2.7.4 > >
On Wed, 7 Aug 2019 at 16:19, Vladimir Oltean <olteanv@gmail.com> wrote: > > On Wed, 7 Aug 2019 at 16:09, YueHaibing <yuehaibing@huawei.com> wrote: > > > > Fixes gcc '-Wunused-but-set-variable' warning: > > > > drivers/net/dsa/sja1105/sja1105_main.c: In function sja1105_fdb_dump: > > drivers/net/dsa/sja1105/sja1105_main.c:1226:14: warning: > > variable tx_vid set but not used [-Wunused-but-set-variable] > > drivers/net/dsa/sja1105/sja1105_main.c:1226:6: warning: > > variable rx_vid set but not used [-Wunused-but-set-variable] > > > > They are not used since commit 6d7c7d948a2e ("net: dsa: > > sja1105: Fix broken learning with vlan_filtering disabled") > > > > Reported-by: Hulk Robot <hulkci@huawei.com> > > Signed-off-by: YueHaibing <yuehaibing@huawei.com> > > --- > > Reviewed-by: Vladimir Oltean <olteanv@gmail.com> This patch should also go to the "net" tree. > > > drivers/net/dsa/sja1105/sja1105_main.c | 4 ---- > > 1 file changed, 4 deletions(-) > > > > diff --git a/drivers/net/dsa/sja1105/sja1105_main.c b/drivers/net/dsa/sja1105/sja1105_main.c > > index d073baf..df976b25 100644 > > --- a/drivers/net/dsa/sja1105/sja1105_main.c > > +++ b/drivers/net/dsa/sja1105/sja1105_main.c > > @@ -1223,12 +1223,8 @@ static int sja1105_fdb_dump(struct dsa_switch *ds, int port, > > { > > struct sja1105_private *priv = ds->priv; > > struct device *dev = ds->dev; > > - u16 rx_vid, tx_vid; > > int i; > > > > - rx_vid = dsa_8021q_rx_vid(ds, port); > > - tx_vid = dsa_8021q_tx_vid(ds, port); > > - > > for (i = 0; i < SJA1105_MAX_L2_LOOKUP_COUNT; i++) { > > struct sja1105_l2_lookup_entry l2_lookup = {0}; > > u8 macaddr[ETH_ALEN]; > > -- > > 2.7.4 > > > >
On Wed, 7 Aug 2019 21:08:56 +0800, YueHaibing <yuehaibing@huawei.com> wrote: > Fixes gcc '-Wunused-but-set-variable' warning: > > drivers/net/dsa/sja1105/sja1105_main.c: In function sja1105_fdb_dump: > drivers/net/dsa/sja1105/sja1105_main.c:1226:14: warning: > variable tx_vid set but not used [-Wunused-but-set-variable] > drivers/net/dsa/sja1105/sja1105_main.c:1226:6: warning: > variable rx_vid set but not used [-Wunused-but-set-variable] > > They are not used since commit 6d7c7d948a2e ("net: dsa: > sja1105: Fix broken learning with vlan_filtering disabled") > > Reported-by: Hulk Robot <hulkci@huawei.com> > Signed-off-by: YueHaibing <yuehaibing@huawei.com> Reviewed-by: Vivien Didelot <vivien.didelot@gmail.com>
From: YueHaibing <yuehaibing@huawei.com> Date: Wed, 7 Aug 2019 21:08:56 +0800 > Fixes gcc '-Wunused-but-set-variable' warning: > > drivers/net/dsa/sja1105/sja1105_main.c: In function sja1105_fdb_dump: > drivers/net/dsa/sja1105/sja1105_main.c:1226:14: warning: > variable tx_vid set but not used [-Wunused-but-set-variable] > drivers/net/dsa/sja1105/sja1105_main.c:1226:6: warning: > variable rx_vid set but not used [-Wunused-but-set-variable] > > They are not used since commit 6d7c7d948a2e ("net: dsa: > sja1105: Fix broken learning with vlan_filtering disabled") > > Reported-by: Hulk Robot <hulkci@huawei.com> > Signed-off-by: YueHaibing <yuehaibing@huawei.com> Applied to 'net'.
diff --git a/drivers/net/dsa/sja1105/sja1105_main.c b/drivers/net/dsa/sja1105/sja1105_main.c index d073baf..df976b25 100644 --- a/drivers/net/dsa/sja1105/sja1105_main.c +++ b/drivers/net/dsa/sja1105/sja1105_main.c @@ -1223,12 +1223,8 @@ static int sja1105_fdb_dump(struct dsa_switch *ds, int port, { struct sja1105_private *priv = ds->priv; struct device *dev = ds->dev; - u16 rx_vid, tx_vid; int i; - rx_vid = dsa_8021q_rx_vid(ds, port); - tx_vid = dsa_8021q_tx_vid(ds, port); - for (i = 0; i < SJA1105_MAX_L2_LOOKUP_COUNT; i++) { struct sja1105_l2_lookup_entry l2_lookup = {0}; u8 macaddr[ETH_ALEN];
Fixes gcc '-Wunused-but-set-variable' warning: drivers/net/dsa/sja1105/sja1105_main.c: In function sja1105_fdb_dump: drivers/net/dsa/sja1105/sja1105_main.c:1226:14: warning: variable tx_vid set but not used [-Wunused-but-set-variable] drivers/net/dsa/sja1105/sja1105_main.c:1226:6: warning: variable rx_vid set but not used [-Wunused-but-set-variable] They are not used since commit 6d7c7d948a2e ("net: dsa: sja1105: Fix broken learning with vlan_filtering disabled") Reported-by: Hulk Robot <hulkci@huawei.com> Signed-off-by: YueHaibing <yuehaibing@huawei.com> --- drivers/net/dsa/sja1105/sja1105_main.c | 4 ---- 1 file changed, 4 deletions(-)