Commit 13ad4848 authored by Tony Luck's avatar Tony Luck Committed by Borislav Petkov (AMD)
Browse files

x86/cpu/vfm: Delete X86_MATCH_INTEL_FAM6_MODEL[_STEPPING]() macros 



These macros have been replaced by X86_MATCH_VFM[_STEPPING]()

Signed-off-by: default avatarTony Luck <tony.luck@intel.com>
Signed-off-by: default avatarBorislav Petkov (AMD) <bp@alien8.de>
Link: https://lore.kernel.org/r/20240903173443.7962-3-tony.luck@intel.com
parent 171a7d95

arch/x86/include/asm/cpu_device_id.h

+0 −20
Original line number Diff line number Diff line
@@ -192,26 +192,6 @@ 
#define X86_MATCH_VENDOR_FAM(vendor, family, data)			\

	X86_MATCH_VENDOR_FAM_MODEL(vendor, family, X86_MODEL_ANY, data)



/**

 * X86_MATCH_INTEL_FAM6_MODEL - Match vendor INTEL, family 6 and model

 * @model:	The model name without the INTEL_FAM6_ prefix or ANY

 *		The model name is expanded to INTEL_FAM6_@model internally

 * @data:	Driver specific data or NULL. The internal storage

 *		format is unsigned long. The supplied value, pointer

 *		etc. is casted to unsigned long internally.

 *

 * The vendor is set to INTEL, the family to 6 and all other missing

 * arguments of X86_MATCH_VENDOR_FAM_MODEL_FEATURE() are set to wildcards.

 *

 * See X86_MATCH_VENDOR_FAM_MODEL_FEATURE() for further information.

 */

#define X86_MATCH_INTEL_FAM6_MODEL(model, data)				\

	X86_MATCH_VENDOR_FAM_MODEL(INTEL, 6, INTEL_FAM6_##model, data)



#define X86_MATCH_INTEL_FAM6_MODEL_STEPPINGS(model, steppings, data)	\

	X86_MATCH_VENDOR_FAM_MODEL_STEPPINGS_FEATURE(INTEL, 6, INTEL_FAM6_##model, \

						     steppings, X86_FEATURE_ANY, data)



/**

 * X86_MATCH_VFM - Match encoded vendor/family/model

 * @vfm:	Encoded 8-bits each for vendor, family, model