From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f46.google.com (mail-pj1-f46.google.com [209.85.216.46]) (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 B44F041D226 for ; Thu, 23 Jul 2026 18:46:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.46 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784832392; cv=none; b=IxbLMSONhXJJ8AYaMsnk/vbwCyhEoyjrDVcSJcs8ybK2+re+wapgCaqZvFbi5F5qJBfXje3B94Kf/Ej+AjJB+PR03zmAUiPsjDy80D7Z3OUA2ETUNQBGACBULfsFKQ8fVPDfULfrvaT12wPbPZsbCuVn+ltZ5BR8WJiZnmm3yMk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784832392; c=relaxed/simple; bh=urFPXC2bDGFRb3YEWf5ToWXnZVSrmuUPwVRzUD+dqlY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=kdpXryqxa9KUeQ1TvOxU6wmGdqMrgVDI0/DpJC+o0n81dCpq1yyoJ1kkerloI1bvJ+xCt5xJf17iPkzcoY40XbK3/0xCDLWgTxu9zz/4LxbwcuKYIQAHONyQeKn5Pxsq5KEb/5AMCJ0LHVJOqDoNL78guHvnqHUdzTuXdWyWhFY= 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=ZysxmINY; arc=none smtp.client-ip=209.85.216.46 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="ZysxmINY" Received: by mail-pj1-f46.google.com with SMTP id 98e67ed59e1d1-38511175ad3so736235a91.2 for ; Thu, 23 Jul 2026 11:46:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1784832382; x=1785437182; 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=ZysxmINYypslLelTrq15Hxa7Cplwyi0Q2Wp5PFsML9nEo67/mprZWkssYVXYRM5uE8 b1Ygrr6BoX15S5asvEd1dKqykBZ9feWjescyheGSz8+UyYB6FMmlNtqK7IFI6gsENX9J JE8ZOojtcEw9fsMFse7RB++GAIISb4Mm8w1Kf1x+GkVZ3xCqQiKBIAy3VddECBQRaujD F1DrXRzMVu9lIZXaq/f20C7VUeLtB0w6bX42RKee0dDqZ4hHH5HOt8NBFbKbZwY0uwcd eiaztjbBZfBJsYpWy85CSXF8dQ6ooancGhX0m0Vg4BbY2U1ypZ3Ap4JPbaT1bI5gF1n8 5qXg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784832382; x=1785437182; 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=Qz/1IcHOyXRZuxkbW0PseVL9iibgUO0+KVC2ah3xcJoNHqGwmcv/yQ/jQNoAepS8wV vKclQP34KTethgk4HQq6ZfEfORfdjIHpppmZPkO2Qt5SPz9iV3Fi+6WwjKlFLBTAYvVh HurYizyoBBahVSfCS9OgqeANkrc81p+2V0D8HiCxU+IUa8j9rza5jJ27g5tFv9HLKSEw UtuSbl8pMF64uaOflY/2IuhHnkqXFy0H5l/5PT57yE5UtCuqsHWqBnYzG5kCis21gMaW nWeJNHCXuUrk+2MUCoNojl+uYN1IbtD12CxZ+NEFwp0M+1wi7SNyodrMv81fabK2vg1i 3zbA== X-Forwarded-Encrypted: i=1; AHgh+Ro4siyPOWZNiu8sN5tMXxMOb2+dwulCGAZRXjjJncHUuf5PluW1da1x6jw4fbNVzCOsHuG1jnu3biqwvqU=@vger.kernel.org X-Gm-Message-State: AOJu0YzM4J73aHjsY6UMtRhonpzKJRk31+WjwU40pe35X0D1mgae2ImA Jax5tJcuG+zX0uYugangrxkYpbCvt4rbIZBirWnCfVwkWx9Ix124MZxb X-Gm-Gg: AR+sD117foRNFRyQmaE65rwc3v+8952ldrTw9DmS6IuoHmDBdUMsC41nn3GH+JEv0pL /m/6GRGxdnI1ZrseEzlHw/YHy/QOwnkQ58IJsg5rrq+jtlima7r+lJh/QMgGfiooKVz/pyuZB56 jSiRYVZAvW81YkLH+TJLutpYjOoEAmoU65k9e/E6v9Gj1pEM22ZHaEZRhI9IfPwOkM0EGa9BXo4 5aE4w6crHkys7rYpXiJGEorJ3APTJ5J6jY9cw7Jik5d6StrjvDgA/NHKnWhsbQiw6F4MR9qTjjM 2h9v3zyeSqtxFh1sqQKbBK8ffoXJgv2/oD9xBvy3joGegsKWmJJgieoMzQpQQ7Z+RJBCg91cNpc se3SK3Ej83+u+NEvhyu3qiiynQvOxKB10h2KVLBwbJ9ebhg+tFW9DOm5Hbj5geVy5vnvUezLPgL 7S45GbjUE= X-Received: by 2002:a17:90b:53c4:b0:37f:ed7e:7e42 with SMTP id 98e67ed59e1d1-38ec64f3415mr4603537a91.14.1784832381937; Thu, 23 Jul 2026 11:46:21 -0700 (PDT) Received: from ubuntu.. ([110.9.142.4]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-38f03af8a45sm308155a91.10.2026.07.23.11.46.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Jul 2026 11:46:21 -0700 (PDT) From: Sang-Heon Jeon To: Julia.Lawall@inria.fr, Tony Nguyen , Przemek Kitszel , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni Cc: cocci@inria.fr, intel-wired-lan@lists.osuosl.org, linux-kernel@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH 09/36] net: intel: remove conditional return with no effect Date: Fri, 24 Jul 2026 03:45:11 +0900 Message-ID: <20260723184538.3888637-10-ekffu200098@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260723184538.3888637-1-ekffu200098@gmail.com> References: <20260723184538.3888637-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