From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f47.google.com (mail-pj1-f47.google.com [209.85.216.47]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CF8953033FE for ; Sat, 25 Jul 2026 15:11:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.47 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784992286; cv=none; b=o59LHu1DFRYcrJC+2NjhrNPuyq8Mp/L5bR/iNkn0SNKQGC4c9EH+m03npLoEOtjsdJusguvaMjyYO2yXweK2Nyh6fm1F7vwW6orbunErb+4GU6kOK1NFzzpM8MW1uPwkszlWJF140mETbY/0ndmuMwU8KoTetPR3yjVZDtEByxs= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784992286; c=relaxed/simple; bh=urFPXC2bDGFRb3YEWf5ToWXnZVSrmuUPwVRzUD+dqlY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=A3/8XxsPWsolfMY2a7gKwRRJ97aoJL2OTQctik8vkSbuiaiUMTfm2eIsRtk6iMwJXVXWZCEMNXMbELdIkCs6BCiKNyWdg+Yi0pQbdArQkCKSp7SvTkujoJ5IBp+3kYnxfGKSmQA3/8DlH7NbqZin6xNjifLO3JLXSzJRx40ASsU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=HUGcmjJa; arc=none smtp.client-ip=209.85.216.47 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="HUGcmjJa" Received: by mail-pj1-f47.google.com with SMTP id 98e67ed59e1d1-381b831d535so1666502a91.0 for ; Sat, 25 Jul 2026 08:11:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1784992284; x=1785597084; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=kxRvmx1wxGvV8pBQOXsif8sDMDGk8D/ZvwH0veNhWow=; b=HUGcmjJaF49QjZp91ug3O3BARHAqXMAghSBmeV8elA7uICu9Mgt++EQR4PurpIibcq hv1OwAT4ZJFydRiG7DtL8Ra9AVsAb3OxY9sd/mwa3Srnj9I74iB5o3/x5y2Etna2zay0 ZPmCl98JZGJE+ID7ESNmnGI6SRT7NJl33hSjVqFbSoKX0KfCclst1dCNfXbHRrjEGFQl asRFzg9m6hHIXM3q2X3G2BGtH38q8FlHV+ZmocWzYSPEE18XQ1U9pm9EZaAKnISxljSX kUG6KrspIFthPZ2wprdiaxDwdzl3DCL85xhxYouDhL8eai7hQZD+/3vft3yy4MKWKOHh Hq5g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784992284; x=1785597084; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=kxRvmx1wxGvV8pBQOXsif8sDMDGk8D/ZvwH0veNhWow=; b=YNq2c22Nw/+usZUKAjnvWzoxPRotXyCx4d7ANtt8O6Bkgc+uiwylTtmaih2dGrhqSr 4inpUHOQ2q+7bNRNL2P01EIXyHROXkEYq3YXem5gfnQBVTxcIe676P5xjDGxu8FyJEYM ljRTZ0gkeEyYnDYdVFiGZmbR+4FkpozosbqJfpm5rGxLKDQe0Lvo2YWLyTBta79iEt8z 5Ea93Ol1h+flohD2LycLFRMV9VfH6VgO/jUsRa3GZVhlNFWIH2VAF4VapRlJVAbLriOB XvU1+DWyJeZRHf4WPLLkwe/QvWLWOMsn0kGW33272gnwLKB0HxEwoPk575QVxhFUQZ+f WjlQ== X-Forwarded-Encrypted: i=1; AHgh+Rp3zP5YYbPDPCNoohkidR4d039QsIetDx8y7nLMRq/oP2l2Uo5ikL2wLzH00zc6nYUQp/ZYhPh6eiqssQw=@vger.kernel.org X-Gm-Message-State: AOJu0YyAcZ4BpO/uNtFsMHUcb/kFAlHyRgytkJeV4wxrs2hNkZEL7XcQ 3R8eHBVYl2y+bbag+QTCe49g7XLWp0h7692rh3wrMLGZxoBG6nVwBE16 X-Gm-Gg: AR+sD13GdTAzj3dlDqM3cMs4KHAFfagg4dymY6PQxT0ql2469TLJ1aWAYmxeCb3lFEZ BKxAhGzLwIfR43cbysmcp63YOlPCyHgG9eWXOwe80v879PtmceXYIHHqrCbki2fiMrZACFaSSjA 2MwALaAKZMIbksOGgln0jKZwru+bSwgc5y5xUS1WGi/zN8+AyTijMqxl+tql95kWT+HlBCbPC/p iq3XJNEJtWCLHkNc519QlY1ufzWdcPemSAm2S8jrB7QVEqc0pz+R9IGiQWjcZ5ZwdxUQDB7uRur fhEIFLXb3nGzF2JKvNSz3+BxeM1/2M+nfczuyMQKap1NaRlWUq9XFsuegG8ZM4jRXs++yWuIa6l p6fcjgR9in7VTOcgqfoD57X7n9hzcy9In/ueevmJC92Yd+AxnuKc+pJsKe1bn0fJA9z2iKdws7T MQ1REjzn4= X-Received: by 2002:a17:90b:4c8f:b0:381:792d:f993 with SMTP id 98e67ed59e1d1-38f294f144fmr2785423a91.17.1784992284028; Sat, 25 Jul 2026 08:11:24 -0700 (PDT) Received: from ubuntu.. ([110.9.142.4]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-38f031d1d6csm2907665a91.0.2026.07.25.08.11.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 25 Jul 2026 08:11:23 -0700 (PDT) From: Sang-Heon Jeon To: kuba@kernel.org, Tony Nguyen , Przemek Kitszel , Andrew Lunn , "David S. Miller" , Eric Dumazet , Paolo Abeni Cc: intel-wired-lan@lists.osuosl.org, linux-kernel@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH net-next v2 4/4] net: intel: remove conditional return with no effect Date: Sun, 26 Jul 2026 00:08:52 +0900 Message-ID: <20260725150852.859188-5-ekffu200098@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260725150852.859188-1-ekffu200098@gmail.com> References: <20260725150852.859188-1-ekffu200098@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Both branches of the check return the same value, so the check has no effect. Remove it and return the value directly. This is the result of running the Coccinelle script from scripts/coccinelle/misc/cond_return_no_effect.cocci. Signed-off-by: Sang-Heon Jeon --- drivers/net/ethernet/intel/i40e/i40e_main.c | 8 +------- drivers/net/ethernet/intel/igb/e1000_i210.c | 6 +----- drivers/net/ethernet/intel/igc/igc_phy.c | 6 +----- 3 files changed, 3 insertions(+), 17 deletions(-) diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c index a04683004a56..0cd0e5597c90 100644 --- a/drivers/net/ethernet/intel/i40e/i40e_main.c +++ b/drivers/net/ethernet/intel/i40e/i40e_main.c @@ -4864,16 +4864,10 @@ static void i40e_control_rx_q(struct i40e_pf *pf, int pf_q, bool enable) **/ int i40e_control_wait_rx_q(struct i40e_pf *pf, int pf_q, bool enable) { - int ret = 0; - i40e_control_rx_q(pf, pf_q, enable); /* wait for the change to finish */ - ret = i40e_pf_rxq_wait(pf, pf_q, enable); - if (ret) - return ret; - - return ret; + return i40e_pf_rxq_wait(pf, pf_q, enable); } /** diff --git a/drivers/net/ethernet/intel/igb/e1000_i210.c b/drivers/net/ethernet/intel/igb/e1000_i210.c index 9db29b231d6a..784f9a7bcbed 100644 --- a/drivers/net/ethernet/intel/igb/e1000_i210.c +++ b/drivers/net/ethernet/intel/igb/e1000_i210.c @@ -756,11 +756,7 @@ static s32 __igb_access_xmdio_reg(struct e1000_hw *hw, u16 address, return ret_val; /* Recalibrate the device back to 0 */ - ret_val = hw->phy.ops.write_reg(hw, E1000_MMDAC, 0); - if (ret_val) - return ret_val; - - return ret_val; + return hw->phy.ops.write_reg(hw, E1000_MMDAC, 0); } /** diff --git a/drivers/net/ethernet/intel/igc/igc_phy.c b/drivers/net/ethernet/intel/igc/igc_phy.c index 4cf737fb3b21..b758a7e0f013 100644 --- a/drivers/net/ethernet/intel/igc/igc_phy.c +++ b/drivers/net/ethernet/intel/igc/igc_phy.c @@ -675,11 +675,7 @@ static s32 __igc_access_xmdio_reg(struct igc_hw *hw, u16 address, return ret_val; /* Recalibrate the device back to 0 */ - ret_val = hw->phy.ops.write_reg(hw, IGC_MMDAC, 0); - if (ret_val) - return ret_val; - - return ret_val; + return hw->phy.ops.write_reg(hw, IGC_MMDAC, 0); } /** -- 2.43.0