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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,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 432EDC3F2D1 for ; Sun, 1 Mar 2020 14:45:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 115B32468A for ; Sun, 1 Mar 2020 14:45:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1583073929; bh=9KtukmZijRId5kiusFi5hitm4NG8edEvNEd26bj3bBA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=UhXbBbErVsU107RhgJeApMs2nNN2EdakiQfEZ/4loJc3pglCjd8aKwkJKQ2PeDTxu qAyTtL9vPf9e0bmkd/ISjNir6Syh+mgBlGclA7KnarRHiolCDSUN5Qb82ADo3lOM/M sN6ITQun/CWQuc1972dwC9VtfMo9SXQXXsmCEEsE= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726877AbgCAOp2 (ORCPT ); Sun, 1 Mar 2020 09:45:28 -0500 Received: from mail.kernel.org ([198.145.29.99]:52404 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726103AbgCAOp1 (ORCPT ); Sun, 1 Mar 2020 09:45:27 -0500 Received: from localhost (unknown [193.47.165.251]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id D080F24680; Sun, 1 Mar 2020 14:45:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1583073927; bh=9KtukmZijRId5kiusFi5hitm4NG8edEvNEd26bj3bBA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=zw72cCDa0zknjOpYLG6PRt/ozVjQIKp/A9+OmsXjde0KQ7kHARKtnAF8SVO+90kDN ZAStzf4/qaopChRLxwbPaq5XHA4FDFW5wwrp9CL/4rF9OzXH1QaFDiLIbxjvcPcb+S A1U4KqT/NYwjl5ySKw1ql+msyRRljyBEoqLJbrgE= From: Leon Romanovsky To: "David S . Miller" , Jakub Kicinski Cc: Leon Romanovsky , netdev@vger.kernel.org, Vishal Kulkarni Subject: [PATCH net-next 09/23] net/chelsio: Don't set N/A for not available FW Date: Sun, 1 Mar 2020 16:44:42 +0200 Message-Id: <20200301144457.119795-10-leon@kernel.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200301144457.119795-1-leon@kernel.org> References: <20200301144457.119795-1-leon@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Leon Romanovsky There is no need to set N/A if FW is not available. Signed-off-by: Leon Romanovsky --- drivers/net/ethernet/chelsio/cxgb4/cxgb4_ethtool.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_ethtool.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_ethtool.c index f3acdce74d43..2cf35696b1c4 100644 --- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_ethtool.c +++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_ethtool.c @@ -174,9 +174,7 @@ static void get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info) sizeof(info->bus_info)); info->regdump_len = get_regs_len(dev); - if (!adapter->params.fw_vers) - strcpy(info->fw_version, "N/A"); - else + if (adapter->params.fw_vers) snprintf(info->fw_version, sizeof(info->fw_version), "%u.%u.%u.%u, TP %u.%u.%u.%u", FW_HDR_FW_VER_MAJOR_G(adapter->params.fw_vers), -- 2.24.1