From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.8]) (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 E07BC130E5D for ; Thu, 28 Mar 2024 16:28:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.8 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711643323; cv=none; b=fxkGTgNwDMnjqgkYIVc+l0lqhKsUPLI0y7LSS2Ys1D/MKyiPg2YJwfLPy+lZMvRjAR/ozebHbqYf+HnKBdosr39jcp+F4DLlWZawDYKtWWwgOwDjioX9y9TDrRy1UICAXLOSabEz6+N1JlASimFXsq6YQLTEuaJefgHHyoJuFYg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711643323; c=relaxed/simple; bh=Vqw6hGKcwq+OHt1l5gD+alpowuBoqlAP62ok0O2Xz1w=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=AilIRRMky5PZAfKJvHJnO/5FFNmTsWJCm/KpQUA55vcnLkYpaWgAWUF2uCk+Swb7xtrkSOuNbavRoeP5c4D37Y8L2pL0zO/d5siZizxmNrjlv2C8IbXn6cKCBIXPcswS7EDUWNTvkypZiOthRHF39i6x37NLiUyoo2UhGJWZ1jU= 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=MGqABiV+; arc=none smtp.client-ip=192.198.163.8 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="MGqABiV+" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1711643320; x=1743179320; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Vqw6hGKcwq+OHt1l5gD+alpowuBoqlAP62ok0O2Xz1w=; b=MGqABiV+LOnAUWt+VcODBUWGpy3X2C8XVMFZcSWgWcpOSyrZdKK8gNgM 2TlVQiK9rGJgCg3SJtbCybYbDPRgIuSNdflB9mucGwTUwiqON496/2vlW i6EUyei4HFvsomdQjqjzg9qg6yLisNHjTWxEG6vdYDS71TDpyHYPrjmRM Vqg0xveD76OahSWJ25UOshLmpTrkU3/oEHA/g9o7IefGiIX29XjpEPKmK 0QwKgnZlz6zRJxzfZu6OoaVKoHXa3wo8UgFqwL/1t9MKOS69MjImWcLNZ TnRGerM7eqGGrbVCGim6N/0qjYXUyCO3wI/PLE7c7ifk86+LAo/myaYWf A==; X-CSE-ConnectionGUID: rRkB3dqKSeSw8GPX16jdUg== X-CSE-MsgGUID: tfEghqpVR8KMogGjJg6Bnw== X-IronPort-AV: E=McAfee;i="6600,9927,11027"; a="24294808" X-IronPort-AV: E=Sophos;i="6.07,162,1708416000"; d="scan'208";a="24294808" Received: from fmviesa009.fm.intel.com ([10.60.135.149]) by fmvoesa102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 Mar 2024 09:28:22 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.07,162,1708416000"; d="scan'208";a="16726197" Received: from agluck-desk3.sc.intel.com ([172.25.222.105]) by fmviesa009-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 Mar 2024 09:28:24 -0700 From: Tony Luck To: patches@lists.linux.dev Cc: Tony Luck Subject: [PATCH 73/74] x86/cpu/vfm: Delete X86_MATCH_INTEL_FAM6_MODEL[_STEPPING]() macros Date: Thu, 28 Mar 2024 09:28:07 -0700 Message-ID: <20240328162820.242778-73-tony.luck@intel.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240328090459.242500-tony.luck@intel.com> References: <20240328090459.242500-tony.luck@intel.com> Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit These macros have been replaced by X86_MATCH_VFM[_STEPPING]() Signed-off-by: Tony Luck --- arch/x86/include/asm/cpu_device_id.h | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/arch/x86/include/asm/cpu_device_id.h b/arch/x86/include/asm/cpu_device_id.h index dd5c132d3792..e1df28a380b1 100644 --- a/arch/x86/include/asm/cpu_device_id.h +++ b/arch/x86/include/asm/cpu_device_id.h @@ -187,26 +187,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 -- 2.44.0