Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp3248861pxj; Tue, 1 Jun 2021 00:36:06 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwUrPyI9wp7zTI5+xafgxSw7y4Sl+/uYEY9HW59O91GEh4sEjvXPviEX/lQskMVay6R+fFe X-Received: by 2002:a17:906:fcb5:: with SMTP id qw21mr19232311ejb.57.1622532966466; Tue, 01 Jun 2021 00:36:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1622532966; cv=none; d=google.com; s=arc-20160816; b=yPXUIo0mCtRUKAL4RT8naSCWoJ131Czgh1bkbX+y7UATWXSLnaWkVA8FA6zpvuJQli n0EJZLuk9p9wcPLValjbi5n+ccjUL2cJYINpV6sJEBQMy2NVsm78vTa9oxLqk4JZJZEo 2JMQW3Z+Zij8zz0Aw/VJEF5tlIZFJuPRCa1Hkum3aOjrCAz8onADN3xYS92SHd203np9 ZKG5TmVd2BW4GuwT8WX+D+o9ZAI1reI4FGYNZyImbGtwVVdT428pgwaTRDu4pcIiAKAu oliC9CRjLNEl/FgBMFwkvhb0tdAPzFN/55WR5JyBs7ukokQVdtY/ZmrgjLyv8g/ue/I6 ZWrA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=8suIICggj4EcpRmBee6wMu72cZJIVeC3Y7nEfiItzAQ=; b=JLYT3Rbjyiasiv+HcEF/CWiYM8A6OXjyiuCixX8M8ycHMqSMVrdYad3+bVvwUdNq7l lqykJ8J9LUDz/o2T2rp4NnGAG7Apwuxil9oF6+odAeYWHTT++5uujtkDOSGRbuoHqVAg 2YqkVZQTvW6++funUQKSgFYnoOoSFKbS97bb3+5oIo8IPoZ1kVHS5oqjfPwWFg08lWSF S8URUPyxIk+VbPKVU2jt58MQKA+Y3kHu448fIO5T9A4ox4PNuhUQvxR18VAGKFFvEauD mC2Mmd/6uHFlCeo3IADUVAgfc1NNDvbDw3o5Ezr1pktHyksql6NxRwBtkERUAoOVBNEv 1eiw== 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=huawei.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id qn16si8142613ejb.312.2021.06.01.00.35.43; Tue, 01 Jun 2021 00:36:06 -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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233184AbhFAHgP (ORCPT + 99 others); Tue, 1 Jun 2021 03:36:15 -0400 Received: from szxga02-in.huawei.com ([45.249.212.188]:2926 "EHLO szxga02-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233096AbhFAHgO (ORCPT ); Tue, 1 Jun 2021 03:36:14 -0400 Received: from dggeme760-chm.china.huawei.com (unknown [172.30.72.56]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4FvP3q0Tpsz67H4; Tue, 1 Jun 2021 15:31:35 +0800 (CST) Received: from localhost.localdomain (10.175.104.82) by dggeme760-chm.china.huawei.com (10.3.19.106) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2176.2; Tue, 1 Jun 2021 15:34:30 +0800 From: Zheng Yongjun To: , , , CC: , , Zheng Yongjun Subject: [PATCH net-next] igb: Declare the function igb_init_nvm_params_i210 as void Date: Tue, 1 Jun 2021 15:48:10 +0800 Message-ID: <20210601074810.4079573-1-zhengyongjun3@huawei.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: 7BIT Content-Type: text/plain; charset=US-ASCII X-Originating-IP: [10.175.104.82] X-ClientProxiedBy: dggems705-chm.china.huawei.com (10.3.19.182) To dggeme760-chm.china.huawei.com (10.3.19.106) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org variable 'ret_val' is unneeded and it's noneed to check the return value of function igb_init_nvm_params_i210, so declare it as void. Signed-off-by: Zheng Yongjun --- drivers/net/ethernet/intel/igb/e1000_82575.c | 2 +- drivers/net/ethernet/intel/igb/e1000_i210.c | 4 +--- drivers/net/ethernet/intel/igb/e1000_i210.h | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/drivers/net/ethernet/intel/igb/e1000_82575.c b/drivers/net/ethernet/intel/igb/e1000_82575.c index 50863fd87d53..967aa20f4cc6 100644 --- a/drivers/net/ethernet/intel/igb/e1000_82575.c +++ b/drivers/net/ethernet/intel/igb/e1000_82575.c @@ -682,7 +682,7 @@ static s32 igb_get_invariants_82575(struct e1000_hw *hw) switch (hw->mac.type) { case e1000_i210: case e1000_i211: - ret_val = igb_init_nvm_params_i210(hw); + igb_init_nvm_params_i210(hw); break; default: break; diff --git a/drivers/net/ethernet/intel/igb/e1000_i210.c b/drivers/net/ethernet/intel/igb/e1000_i210.c index 9265901455cd..986e86ab7978 100644 --- a/drivers/net/ethernet/intel/igb/e1000_i210.c +++ b/drivers/net/ethernet/intel/igb/e1000_i210.c @@ -790,9 +790,8 @@ s32 igb_write_xmdio_reg(struct e1000_hw *hw, u16 addr, u8 dev_addr, u16 data) * igb_init_nvm_params_i210 - Init NVM func ptrs. * @hw: pointer to the HW structure **/ -s32 igb_init_nvm_params_i210(struct e1000_hw *hw) +void igb_init_nvm_params_i210(struct e1000_hw *hw) { - s32 ret_val = 0; struct e1000_nvm_info *nvm = &hw->nvm; nvm->ops.acquire = igb_acquire_nvm_i210; @@ -813,7 +812,6 @@ s32 igb_init_nvm_params_i210(struct e1000_hw *hw) nvm->ops.validate = NULL; nvm->ops.update = NULL; } - return ret_val; } /** diff --git a/drivers/net/ethernet/intel/igb/e1000_i210.h b/drivers/net/ethernet/intel/igb/e1000_i210.h index 5c437fdc49ee..2a436da0be69 100644 --- a/drivers/net/ethernet/intel/igb/e1000_i210.h +++ b/drivers/net/ethernet/intel/igb/e1000_i210.h @@ -11,7 +11,7 @@ s32 igb_read_invm_version(struct e1000_hw *hw, struct e1000_fw_version *invm_ver); s32 igb_read_xmdio_reg(struct e1000_hw *hw, u16 addr, u8 dev_addr, u16 *data); s32 igb_write_xmdio_reg(struct e1000_hw *hw, u16 addr, u8 dev_addr, u16 data); -s32 igb_init_nvm_params_i210(struct e1000_hw *hw); +void igb_init_nvm_params_i210(struct e1000_hw *hw); bool igb_get_flash_presence_i210(struct e1000_hw *hw); s32 igb_pll_workaround_i210(struct e1000_hw *hw); s32 igb_get_cfg_done_i210(struct e1000_hw *hw); -- 2.25.1