From patchwork Wed May 8 17:33:39 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Tony Nguyen X-Patchwork-Id: 13658960 X-Patchwork-Delegate: kuba@kernel.org Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 39E2212C469 for ; Wed, 8 May 2024 17:33:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.17 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715189636; cv=none; b=Ij3sWRJ8I1ttaHjgMBlfgkeTYkMpTQ8dw/NcWAhKOro73OTX31qoSPqvAL+26DMELut9YxidKdgWdRLE42g5s+Lt97kVsDCuBDSkZqgmSG+mXg9Z9plyXdphsizDm0SQAhYTY12ehmyLQfS+XVJKh4xesg6y63UlWW5PZ4sLLL8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715189636; c=relaxed/simple; bh=S5kAvu7vvLLNh2OrPSKBV1yzdQzL7XdknFdkUe9c6Oc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=EkCFVtxigwn7tzMGkNvYXTwp0gXdaxeiL3FjM7Zp+JGtUIt48pLpv9F3gUF1faTfocv0jn7yjF3Ml9PFKGJB8TcXWerwZJqu7xxgLw4TG9ssHCU80puw9Ukly9+iiLd88essm4FM/mNNA8fyveE8UFgSao1+K599YYmTuqSG3UU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com; spf=pass smtp.mailfrom=intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=IESRWX5V; arc=none smtp.client-ip=192.198.163.17 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="IESRWX5V" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1715189635; x=1746725635; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=S5kAvu7vvLLNh2OrPSKBV1yzdQzL7XdknFdkUe9c6Oc=; b=IESRWX5VZuanFw2ifUFgxOBcSKfAk4yAN33IiAz6U1fSHrEvnLLaA6uW gZ6RK36vWZiHAWDPUTJFkA8vttL/6cVfeAGvKBBj2rsK92YcEboscZgq2 eL5h4bOPmV6XtgLxB4vwxLV+YarHnP01bsp/hVL2FlDp1pAGpfAlA+sjE 7ernqU4mydlLF8/kDGOf47sZfFHgaZJz8WgSnCj9nnL279GR+kD9CeXuc rLaA051d4W6tVODVGtxcdHRhfvlRl18b3M0RsvsU8yvVyCqFJ6dtA+cm/ 7uIBK1Va0Rryvbr/+QZXOnOdoMyHgVNvLCRb0jham8yi6zWFYjDhCa06V Q==; X-CSE-ConnectionGUID: TNSNYiJNRE2Lb7x0KBYZgw== X-CSE-MsgGUID: b7aN4xgPSM6P9EteyzsXog== X-IronPort-AV: E=McAfee;i="6600,9927,11067"; a="10938980" X-IronPort-AV: E=Sophos;i="6.08,145,1712646000"; d="scan'208";a="10938980" Received: from orviesa010.jf.intel.com ([10.64.159.150]) by fmvoesa111.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 May 2024 10:33:52 -0700 X-CSE-ConnectionGUID: FohlTwPFR5OsuEqxfPJgWg== X-CSE-MsgGUID: IsVsMyQ6RAmlL3JniZBw8Q== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.08,145,1712646000"; d="scan'208";a="28843725" Received: from anguy11-upstream.jf.intel.com ([10.166.9.133]) by orviesa010.jf.intel.com with ESMTP; 08 May 2024 10:33:51 -0700 From: Tony Nguyen To: davem@davemloft.net, kuba@kernel.org, pabeni@redhat.com, edumazet@google.com, netdev@vger.kernel.org Cc: =?utf-8?q?Ilpo_J=C3=A4rvinen?= , anthony.l.nguyen@intel.com, Hariprasad Kelam , Jesse Brandeburg , Sasha Neftin Subject: [PATCH net-next 7/7] net: e1000e & ixgbe: Remove PCI_HEADER_TYPE_MFD duplicates Date: Wed, 8 May 2024 10:33:39 -0700 Message-ID: <20240508173342.2760994-8-anthony.l.nguyen@intel.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240508173342.2760994-1-anthony.l.nguyen@intel.com> References: <20240508173342.2760994-1-anthony.l.nguyen@intel.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: kuba@kernel.org From: Ilpo Järvinen PCI_HEADER_TYPE_MULTIFUNC is define by e1000e and ixgbe and both are unused. There is already PCI_HEADER_TYPE_MFD in pci_regs.h anyway which should be used instead so remove the duplicated defines of it. Signed-off-by: Ilpo Järvinen Reviewed-by: Hariprasad Kelam Reviewed-by: Jesse Brandeburg Acked-by: Sasha Neftin Signed-off-by: Tony Nguyen --- drivers/net/ethernet/intel/e1000e/defines.h | 2 -- drivers/net/ethernet/intel/ixgbe/ixgbe_type.h | 1 - 2 files changed, 3 deletions(-) diff --git a/drivers/net/ethernet/intel/e1000e/defines.h b/drivers/net/ethernet/intel/e1000e/defines.h index 23a58cada43a..5e2cfa73f889 100644 --- a/drivers/net/ethernet/intel/e1000e/defines.h +++ b/drivers/net/ethernet/intel/e1000e/defines.h @@ -679,8 +679,6 @@ /* PCI/PCI-X/PCI-EX Config space */ #define PCI_HEADER_TYPE_REGISTER 0x0E -#define PCI_HEADER_TYPE_MULTIFUNC 0x80 - #define PHY_REVISION_MASK 0xFFFFFFF0 #define MAX_PHY_REG_ADDRESS 0x1F /* 5 bit address bus (0-0x1F) */ #define MAX_PHY_MULTI_PAGE_REG 0xF diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h b/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h index ed440dd0c4f9..897fe357b65b 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h @@ -2179,7 +2179,6 @@ enum { #define IXGBE_PCI_LINK_SPEED_5000 0x2 #define IXGBE_PCI_LINK_SPEED_8000 0x3 #define IXGBE_PCI_HEADER_TYPE_REGISTER 0x0E -#define IXGBE_PCI_HEADER_TYPE_MULTIFUNC 0x80 #define IXGBE_PCI_DEVICE_CONTROL2_16ms 0x0005 #define IXGBE_PCIDEVCTRL2_TIMEO_MASK 0xf