From patchwork Mon Aug 14 08:54:03 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiri Pirko X-Patchwork-Id: 801108 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=resnulli-us.20150623.gappssmtp.com header.i=@resnulli-us.20150623.gappssmtp.com header.b="0TlmcAus"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3xW8YM0PC4z9t3x for ; Mon, 14 Aug 2017 18:54:15 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752592AbdHNIyL (ORCPT ); Mon, 14 Aug 2017 04:54:11 -0400 Received: from mail-wr0-f196.google.com ([209.85.128.196]:34235 "EHLO mail-wr0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752558AbdHNIyK (ORCPT ); Mon, 14 Aug 2017 04:54:10 -0400 Received: by mail-wr0-f196.google.com with SMTP id x43so369786wrb.1 for ; Mon, 14 Aug 2017 01:54:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=resnulli-us.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=sjKA1v/CPivq4+TrPRC8bDgULRAqeEr1UQXSvRX9rgA=; b=0TlmcAusd9zwrJXNcEffdHTyYX/fabIQo4iAdag6ltC0E08wZ0EwiTp0NSPJeU6w5s W97YzHUphsxQKtLoXGZqnCq8voWcEAOsF2lTyzDiUel/Bs8Y9CiipafIlML9esMXnZ/D qtjq9kwTS+Zd4FGFEeWva/DchqpVDGIz1d3MuTKAd2OXNXK1s+pjBpMNiP9ZXCLOIF+/ fE/8LJGr+o9nyKKb8v2NSNvqctA9I3XuHo2G+88LkIzzdL0ZyawnCwAZdERDqeL5FElu D0yuAgmSkJ2kaK5oeR7xh3yXVQTQ0c8s+J7zNGiIypAQQ4nswwTqXfwl6384hK8YDy+0 WlYg== 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=sjKA1v/CPivq4+TrPRC8bDgULRAqeEr1UQXSvRX9rgA=; b=cfdwNey0QNtD7bVPgB4N5OMJUgAIczpK4SLMxml5CRrtaNtJ1+V2spOCZrmbGDo9B8 q8WdDBX0/v33ePWzRchjBJX4f4vZ1NJgeQVx+zNeQ+BH4/UI++QXC+Jriaf2dJGnjhLn HWGOYj1VuR/CeFWXiVccAmj9+bZv9R8kNnthjRnr/hgjV9NtZiUaNSKdCGd5YO+YLAQD X4Lf8Qr68kqELzPuvLqefWIUN2kQQL+ewJA7nTrYfsMiD2LUUDhqyxHlTb/78ox0Jilw jdAxKRvTBuPE0b6k+R6Hp7d8mcTmwjdSFDaxUT4vA6p548VnHJPRRUhLbpDb09qIj3Ba H0qQ== X-Gm-Message-State: AHYfb5j3WXZkoEo0WMfyBOtVmp03h7m8iIE3ITRFobhGKmCv5bFJnNZH hAMy0tYEiihqgbC4lC0= X-Received: by 10.223.152.19 with SMTP id v19mr956300wrb.60.1502700848859; Mon, 14 Aug 2017 01:54:08 -0700 (PDT) Received: from localhost (ip-89-103-152-58.net.upcbroadband.cz. [89.103.152.58]) by smtp.gmail.com with ESMTPSA id l81sm4947838wmf.26.2017.08.14.01.54.07 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 14 Aug 2017 01:54:08 -0700 (PDT) From: Jiri Pirko To: netdev@vger.kernel.org Cc: davem@davemloft.net, idosch@mellanox.com, mlxsw@mellanox.com Subject: [patch net-next 1/3] mlxsw: spectrum_router: Return void from deletion functions Date: Mon, 14 Aug 2017 10:54:03 +0200 Message-Id: <20170814085405.1452-2-jiri@resnulli.us> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170814085405.1452-1-jiri@resnulli.us> References: <20170814085405.1452-1-jiri@resnulli.us> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Ido Schimmel There is no point in returning a value from function whose return value is never checked. Even if the return value was checked, there wouldn't be anything to do about it, as these functions are either called from error or deletion paths. Signed-off-by: Ido Schimmel Signed-off-by: Jiri Pirko --- drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c index 93b6da8..220e7e7 100644 --- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c +++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c @@ -505,15 +505,15 @@ static int mlxsw_sp_lpm_tree_alloc(struct mlxsw_sp *mlxsw_sp, return mlxsw_reg_write(mlxsw_sp->core, MLXSW_REG(ralta), ralta_pl); } -static int mlxsw_sp_lpm_tree_free(struct mlxsw_sp *mlxsw_sp, - struct mlxsw_sp_lpm_tree *lpm_tree) +static void mlxsw_sp_lpm_tree_free(struct mlxsw_sp *mlxsw_sp, + struct mlxsw_sp_lpm_tree *lpm_tree) { char ralta_pl[MLXSW_REG_RALTA_LEN]; mlxsw_reg_ralta_pack(ralta_pl, false, (enum mlxsw_reg_ralxx_protocol) lpm_tree->proto, lpm_tree->id); - return mlxsw_reg_write(mlxsw_sp->core, MLXSW_REG(ralta), ralta_pl); + mlxsw_reg_write(mlxsw_sp->core, MLXSW_REG(ralta), ralta_pl); } static int @@ -569,10 +569,10 @@ mlxsw_sp_lpm_tree_create(struct mlxsw_sp *mlxsw_sp, return ERR_PTR(err); } -static int mlxsw_sp_lpm_tree_destroy(struct mlxsw_sp *mlxsw_sp, - struct mlxsw_sp_lpm_tree *lpm_tree) +static void mlxsw_sp_lpm_tree_destroy(struct mlxsw_sp *mlxsw_sp, + struct mlxsw_sp_lpm_tree *lpm_tree) { - return mlxsw_sp_lpm_tree_free(mlxsw_sp, lpm_tree); + mlxsw_sp_lpm_tree_free(mlxsw_sp, lpm_tree); } static struct mlxsw_sp_lpm_tree * @@ -601,12 +601,11 @@ mlxsw_sp_lpm_tree_get(struct mlxsw_sp *mlxsw_sp, return lpm_tree; } -static int mlxsw_sp_lpm_tree_put(struct mlxsw_sp *mlxsw_sp, - struct mlxsw_sp_lpm_tree *lpm_tree) +static void mlxsw_sp_lpm_tree_put(struct mlxsw_sp *mlxsw_sp, + struct mlxsw_sp_lpm_tree *lpm_tree) { if (--lpm_tree->ref_count == 0) - return mlxsw_sp_lpm_tree_destroy(mlxsw_sp, lpm_tree); - return 0; + mlxsw_sp_lpm_tree_destroy(mlxsw_sp, lpm_tree); } #define MLXSW_SP_LPM_TREE_MIN 1 /* tree 0 is reserved */