2020-12-09 09:28:16

by Zheng Yongjun

Subject: [PATCH net-next] net: sja1105: simplify the return sja1105_cls_flower_stats()

Simplify the return expression.

Signed-off-by: Zheng Yongjun <[email protected]>
---
drivers/net/dsa/sja1105/sja1105_flower.c | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/drivers/net/dsa/sja1105/sja1105_flower.c b/drivers/net/dsa/sja1105/sja1105_flower.c
index 12e76020bea3..e9617782e0d0 100644
--- a/drivers/net/dsa/sja1105/sja1105_flower.c
+++ b/drivers/net/dsa/sja1105/sja1105_flower.c
@@ -458,7 +458,6 @@ int sja1105_cls_flower_stats(struct dsa_switch *ds, int port,
{
struct sja1105_private *priv = ds->priv;
struct sja1105_rule *rule = sja1105_rule_find(priv, cls->cookie);
- int rc;

if (!rule)
return 0;
@@ -466,12 +465,8 @@ int sja1105_cls_flower_stats(struct dsa_switch *ds, int port,
if (rule->type != SJA1105_RULE_VL)
return 0;

- rc = sja1105_vl_stats(priv, port, rule, &cls->stats,
+ return sja1105_vl_stats(priv, port, rule, &cls->stats,
cls->common.extack);
- if (rc)
- return rc;
-
- return 0;
}

void sja1105_flower_setup(struct dsa_switch *ds)
--
2.22.0

2020-12-09 10:37:25

by Vladimir Oltean

Subject: Re: [PATCH net-next] net: sja1105: simplify the return sja1105_cls_flower_stats()

On Wed, Dec 09, 2020 at 05:25:04PM +0800, Zheng Yongjun wrote:
> Simplify the return expression.
>
> Signed-off-by: Zheng Yongjun <[email protected]>
> ---

Reviewed-by: Vladimir Oltean <[email protected]>

2020-12-09 20:36:36

by Jakub Kicinski

Subject: Re: [PATCH net-next] net: sja1105: simplify the return sja1105_cls_flower_stats()

On Wed, 9 Dec 2020 17:25:04 +0800 Zheng Yongjun wrote:
> Simplify the return expression.
>
> Signed-off-by: Zheng Yongjun <[email protected]>

Looks like this one doesn't apply cleanly to net-next.

2020-12-10 10:31:36

by David Miller

Subject: Re: [PATCH net-next] net: sja1105: simplify the return sja1105_cls_flower_stats()

From: Zheng Yongjun <[email protected]>
Date: Wed, 9 Dec 2020 17:25:04 +0800

> Simplify the return expression.
>
> Signed-off-by: Zheng Yongjun <[email protected]>

Applied.