From patchwork Wed Dec 9 09:25:04 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zheng Yongjun X-Patchwork-Id: 11960957 X-Patchwork-Delegate: kuba@kernel.org Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.7 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B0A1DC433FE for ; Wed, 9 Dec 2020 09:26:09 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6CCE823B77 for ; Wed, 9 Dec 2020 09:26:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729198AbgLIJZh (ORCPT ); Wed, 9 Dec 2020 04:25:37 -0500 Received: from szxga05-in.huawei.com ([45.249.212.191]:9044 "EHLO szxga05-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728990AbgLIJZ2 (ORCPT ); Wed, 9 Dec 2020 04:25:28 -0500 Received: from DGGEMS402-HUB.china.huawei.com (unknown [172.30.72.60]) by szxga05-in.huawei.com (SkyGuard) with ESMTP id 4CrWp56nXzzhnlx; Wed, 9 Dec 2020 17:24:13 +0800 (CST) Received: from ubuntu.network (10.175.138.68) by DGGEMS402-HUB.china.huawei.com (10.3.19.202) with Microsoft SMTP Server id 14.3.487.0; Wed, 9 Dec 2020 17:24:38 +0800 From: Zheng Yongjun To: , CC: , , , , , , "Zheng Yongjun" Subject: [PATCH net-next] net: sja1105: simplify the return sja1105_cls_flower_stats() Date: Wed, 9 Dec 2020 17:25:04 +0800 Message-ID: <20201209092504.20470-1-zhengyongjun3@huawei.com> X-Mailer: git-send-email 2.22.0 MIME-Version: 1.0 X-Originating-IP: [10.175.138.68] X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org Simplify the return expression. Signed-off-by: Zheng Yongjun Reviewed-by: Vladimir Oltean --- 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)