Received: by 2002:a25:868d:0:0:0:0:0 with SMTP id z13csp867127ybk; Fri, 15 May 2020 16:08:26 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyZ4KvT7PzqWRZZ93RqZxpcTB9jAXra7OkYYu9Nnl+P+8lg4Ig/F+JgflG9Gabe/ewunfjj X-Received: by 2002:a17:906:407:: with SMTP id d7mr5309358eja.46.1589584105886; Fri, 15 May 2020 16:08:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1589584105; cv=none; d=google.com; s=arc-20160816; b=uSuOUpa0Ez7G4gnUYX4ceX36U/iCtvWAAlSQTHk4U2QHAfiVmCI5gDNe/Rm4OcvKE2 7N0lYv9KSCTb7dHPpNbHbs/j0FxZYIzcJzV29GXIJPyFwAceZAvitJnnPBBtZFs1UZ+S uW5ley9zl7wLULGrD2lTaajxIpdZKyJPnnApXCkDo/unyBoAUIpdvwfehtIO1NBg2ia4 0ugfcyRyIWNSnYRiWT++RNQpgPKX3bVf6bcXQY4EIapIDQxTQEOxPL/k52djHuwEDNQQ Hsc7PHbBp6D46OmBKESAvfYzFQHkM4NlUT7zr+838xWbwVEBBE0i/Hj1jgJ9r/cB+T3y um+w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=JKr/vpoZ1FxwSapAv98ILDYzmBr8qm7ai7YyCRC/LJI=; b=kkJijINzMWG5qvHX5WRy+6QOn6aM5UMUi6MhvbhnpN8XEeZGV9yvBG8ryflhK3bUkV fOdzvts7RiqfmfJ96jNChQiBAwa179CAYVmVcLaUNWlMteEI+ZMWBythNlYhTi3whRIg 8wSfkEy8Lx1DLgJgnWS9j7MUJWlbuION90OHrOFFE82A2qfqwbNnljj3ae3RixaINNmW gEBUlhmXKo4vBwtgVmwg0M/1NXS7PYgoyZW9TAkZONk2rIq3x705CbIMsq9m8vI2jV2U 8tIEeIFx8/1AGRcwPpXODylk1pVBsFMMNqLWzgyuIpfmd0ifOTpV/DFsXPaJxo6vpJQ9 7fZA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id z13si2197224ejl.473.2020.05.15.16.08.00; Fri, 15 May 2020 16:08:25 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726653AbgEOXGP (ORCPT + 99 others); Fri, 15 May 2020 19:06:15 -0400 Received: from cmccmta2.chinamobile.com ([221.176.66.80]:8082 "EHLO cmccmta2.chinamobile.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726183AbgEOXGP (ORCPT ); Fri, 15 May 2020 19:06:15 -0400 Received: from spf.mail.chinamobile.com (unknown[172.16.121.3]) by rmmx-syy-dmz-app08-12008 (RichMail) with SMTP id 2ee85ebf206220e-0987f; Sat, 16 May 2020 07:06:11 +0800 (CST) X-RM-TRANSID: 2ee85ebf206220e-0987f X-RM-TagInfo: emlType=0 X-RM-SPAM-FLAG: 00000000 Received: from localhost.localdomain (unknown[112.1.172.85]) by rmsmtp-syy-appsvr02-12002 (RichMail) with SMTP id 2ee25ebf205f232-0733c; Sat, 16 May 2020 07:06:10 +0800 (CST) X-RM-TRANSID: 2ee25ebf205f232-0733c From: Tang Bin To: saeedm@mellanox.com, davem@davemloft.net, leon@kernel.org Cc: netdev@vger.kernel.org, linux-rdma@vger.kernel.org, linux-kernel@vger.kernel.org, Tang Bin , Zhang Shengju , Leon Romanovsky Subject: [PATCH v2] net/mlx5e: Use IS_ERR() to check and simplify code Date: Sat, 16 May 2020 07:06:33 +0800 Message-Id: <20200515230633.2832-1-tangbin@cmss.chinamobile.com> X-Mailer: git-send-email 2.20.1.windows.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Use IS_ERR() and PTR_ERR() instead of PTR_ERR_OR_ZERO() to simplify code, avoid redundant judgements. Signed-off-by: Zhang Shengju Signed-off-by: Tang Bin Reviewed-by: Leon Romanovsky --- Changes from v1 - fix the commit message for typo. --- drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.c b/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.c index af4ebd295..00e7add0b 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.c @@ -93,9 +93,8 @@ static int mlx5e_route_lookup_ipv4(struct mlx5e_priv *priv, } rt = ip_route_output_key(dev_net(mirred_dev), fl4); - ret = PTR_ERR_OR_ZERO(rt); - if (ret) - return ret; + if (IS_ERR(rt)) + return PTR_ERR(rt); if (mlx5_lag_is_multipath(mdev) && rt->rt_gw_family != AF_INET) { ip_rt_put(rt); -- 2.20.1.windows.1