From mboxrd@z Thu Jan 1 00:00:00 1970 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=-9.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,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 C6243C11D30 for ; Mon, 24 Feb 2020 13:09:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9BDF120828 for ; Mon, 24 Feb 2020 13:09:24 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="rSkCBZKr" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727735AbgBXNJY (ORCPT ); Mon, 24 Feb 2020 08:09:24 -0500 Received: from mail-wr1-f67.google.com ([209.85.221.67]:34949 "EHLO mail-wr1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727275AbgBXNJX (ORCPT ); Mon, 24 Feb 2020 08:09:23 -0500 Received: by mail-wr1-f67.google.com with SMTP id w12so10323390wrt.2 for ; Mon, 24 Feb 2020 05:09:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Uz/eEXKpHtFspqpag++UbAN6+IZHU4paQXO5ZhiOoO8=; b=rSkCBZKrM8QcOsFN9AyJu04yQtbO/J+1AbQ6mRYQnMZ8MVYfyAp1T50PK7viE6fEnW dITsxxVg5OL1n6MnPlOHNTE4jayb4e1aPZzhrYSjz8PNNIQYQMCTPeY2BjOSBdfUOY5x Lb49IyllWuRuZAwxldP0/2ILMhbU4C9Q2wMvVFl6PVgWcJDG6JEypvkeH6b5LVthJtqi 66gtyFF9BZAd5QChF+uPxkOTH2K2VxcFMSIUYl7Anl93yz3gRzChYfAJGjbszDWNP36F z7bt2Bf/7QCeEPWpYeWGxOAGPynZ6Xz6vt0e0oblb5aajUiCA7PFGABfe4jZh59Z+tJA DhMg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=Uz/eEXKpHtFspqpag++UbAN6+IZHU4paQXO5ZhiOoO8=; b=uKzJFfiNUkkFJpIvdJn76SVYPxTOdm4pbGKtgokwHKCKf/zL55Q5sYwMzCLLn9WdmU 4fFN0c3NMKV4NAiwjRqX7LVJ4dkUgheudVjqkeH50TO8Rto7lukbB6GU1Gmf/OuvhCk1 CABeXJpxbLfZXvdHOYnSkA8Jx7/jlH/F3Dmn9A2wTt+S4BwEwAanHv67XRP5UV6LmtKz 9CPpNTMTcpxZvXeWGW2h03R7+x8HdgIbIVHZ6VsYu/1Wdx3cHmwuCVJllQC2tleJJ987 i80aA6oN3BWgJJJ6j++O+/bzVatZm/YeztLAFlC4TNehJgkGafxQKct6fUy+oWjV3zXe JN5w== X-Gm-Message-State: APjAAAWdOVlpzBReoW2bUZgYjAplh9NzCp3A46Jd0TagXaETQB/hp9lu SMctSsxJbmi9LKaKgsaa1UxO/ZZ7/tA= X-Google-Smtp-Source: APXvYqwmHiZb0zA2jSqvoe7zPxLFXHOLs9vEl7/9z6E/e9ZByHy5+lwOiq3MEEhHx5P93w7oxbBAuw== X-Received: by 2002:a5d:4709:: with SMTP id y9mr66838128wrq.412.1582549761397; Mon, 24 Feb 2020 05:09:21 -0800 (PST) Received: from localhost.localdomain ([79.115.60.40]) by smtp.gmail.com with ESMTPSA id i204sm18089298wma.44.2020.02.24.05.09.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Feb 2020 05:09:20 -0800 (PST) From: Vladimir Oltean To: davem@davemloft.net Cc: horatiu.vultur@microchip.com, alexandre.belloni@bootlin.com, andrew@lunn.ch, f.fainelli@gmail.com, vivien.didelot@gmail.com, joergen.andreasen@microchip.com, allan.nielsen@microchip.com, claudiu.manoil@nxp.com, netdev@vger.kernel.org, UNGLinuxDriver@microchip.com, alexandru.marginean@nxp.com, xiaoliang.yang_1@nxp.com, yangbo.lu@nxp.com, po.liu@nxp.com, jiri@mellanox.com, idosch@idosch.org, kuba@kernel.org Subject: [PATCH net-next 04/10] net: mscc: ocelot: return directly in ocelot_cls_flower_{replace,destroy} Date: Mon, 24 Feb 2020 15:08:25 +0200 Message-Id: <20200224130831.25347-5-olteanv@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200224130831.25347-1-olteanv@gmail.com> References: <20200224130831.25347-1-olteanv@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Vladimir Oltean There is no need to check the "ret" variable, one can just return the function result back to the caller. Signed-off-by: Vladimir Oltean --- drivers/net/ethernet/mscc/ocelot_flower.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/drivers/net/ethernet/mscc/ocelot_flower.c b/drivers/net/ethernet/mscc/ocelot_flower.c index 698e9fee6b1a..8993dadf063c 100644 --- a/drivers/net/ethernet/mscc/ocelot_flower.c +++ b/drivers/net/ethernet/mscc/ocelot_flower.c @@ -192,11 +192,7 @@ int ocelot_cls_flower_replace(struct ocelot *ocelot, int port, return ret; } - ret = ocelot_ace_rule_offload_add(ocelot, ace); - if (ret) - return ret; - - return 0; + return ocelot_ace_rule_offload_add(ocelot, ace); } EXPORT_SYMBOL_GPL(ocelot_cls_flower_replace); @@ -204,16 +200,11 @@ int ocelot_cls_flower_destroy(struct ocelot *ocelot, int port, struct flow_cls_offload *f, bool ingress) { struct ocelot_ace_rule ace; - int ret; ace.prio = f->common.prio; ace.id = f->cookie; - ret = ocelot_ace_rule_offload_del(ocelot, &ace); - if (ret) - return ret; - - return 0; + return ocelot_ace_rule_offload_del(ocelot, &ace); } EXPORT_SYMBOL_GPL(ocelot_cls_flower_destroy); -- 2.17.1