1 files changed, 15 insertions, 16 deletions
diff --git a/arch/x86/include/asm/cpu_device_id.h b/arch/x86/include/asm/cpu_device_id.h
index 3417110574c1..31c379c1da41 100644
--- a/arch/x86/include/asm/cpu_device_id.h
+++ b/arch/x86/include/asm/cpu_device_id.h
@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0 */
-#ifndef _CPU_DEVICE_ID
+#ifndef _ASM_X86_CPU_DEVICE_ID
-#define _CPU_DEVICE_ID 1
+#define _ASM_X86_CPU_DEVICE_ID
 /*
 * Declare drivers belonging to specific x86 CPUs
@@ -9,8 +9,6 @@
 #include <linux/mod_devicetable.h>
-extern const struct x86_cpu_id *x86_match_cpu(const struct x86_cpu_id *match);
 /*
 * Match specific microcode revisions.
 *
@@ -22,21 +20,22 @@ extern const struct x86_cpu_id *x86_match_cpu(const struct x86_cpu_id *match);
 */
 struct x86_cpu_desc {
-        __u8    x86_family;
+        u8      x86_family;
-        __u8    x86_vendor;
+        u8      x86_vendor;
-        __u8    x86_model;
+        u8      x86_model;
-        __u8    x86_stepping;
+        u8      x86_stepping;
-        __u32   x86_microcode_rev;
+        u32     x86_microcode_rev;
 };
-#define INTEL_CPU_DESC(mod, step, rev) {                        \
+#define INTEL_CPU_DESC(model, stepping, revision) {             \
-        .x86_family = 6,                                        \
+        .x86_family             = 6,                            \
-        .x86_vendor = X86_VENDOR_INTEL,                         \
+        .x86_vendor             = X86_VENDOR_INTEL,             \
-        .x86_model = mod,                                       \
+        .x86_model              = (model),                      \
-        .x86_stepping = step,                                   \
+        .x86_stepping           = (stepping),                   \
-        .x86_microcode_rev = rev,                               \
+        .x86_microcode_rev      = (revision),                   \
 }
+extern const struct x86_cpu_id *x86_match_cpu(const struct x86_cpu_id *match);
 extern bool x86_cpu_has_min_microcode_rev(const struct x86_cpu_desc *table);
-#endif
+#endif /* _ASM_X86_CPU_DEVICE_ID */

diff --git a/arch/x86/include/asm/cpu_device_id.h b/arch/x86/include/asm/cpu_device_id.h index 3417110574c1..31c379c1da41 100644 --- a/arch/x86/include/asm/cpu_device_id.h +++ b/arch/x86/include/asm/cpu_device_id.h
@@ -1,6 +1,6 @@
1	/* SPDX-License-Identifier: GPL-2.0 */	1	/* SPDX-License-Identifier: GPL-2.0 */
2	#ifndef _CPU_DEVICE_ID	2	#ifndef _ASM_X86_CPU_DEVICE_ID
3	#define _CPU_DEVICE_ID 1	3	#define _ASM_X86_CPU_DEVICE_ID
4		4
5	/*	5	/*
6	* Declare drivers belonging to specific x86 CPUs	6	* Declare drivers belonging to specific x86 CPUs
@@ -9,8 +9,6 @@
9		9
10	#include <linux/mod_devicetable.h>	10	#include <linux/mod_devicetable.h>
11		11
12	extern const struct x86_cpu_id x86_match_cpu(const struct x86_cpu_id match);
13
14	/*	12	/*
15	* Match specific microcode revisions.	13	* Match specific microcode revisions.
16	*	14	*
@@ -22,21 +20,22 @@ extern const struct x86_cpu_id x86_match_cpu(const struct x86_cpu_id match);
22	*/	20	*/
23		21
24	struct x86_cpu_desc {	22	struct x86_cpu_desc {
25	__u8 x86_family;	23	u8 x86_family;
26	__u8 x86_vendor;	24	u8 x86_vendor;
27	__u8 x86_model;	25	u8 x86_model;
28	__u8 x86_stepping;	26	u8 x86_stepping;
29	__u32 x86_microcode_rev;	27	u32 x86_microcode_rev;
30	};	28	};
31		29
32	#define INTEL_CPU_DESC(mod, step, rev) { \	30	#define INTEL_CPU_DESC(model, stepping, revision) { \
33	.x86_family = 6, \	31	.x86_family = 6, \
34	.x86_vendor = X86_VENDOR_INTEL, \	32	.x86_vendor = X86_VENDOR_INTEL, \
35	.x86_model = mod, \	33	.x86_model = (model), \
36	.x86_stepping = step, \	34	.x86_stepping = (stepping), \
37	.x86_microcode_rev = rev, \	35	.x86_microcode_rev = (revision), \
38	}	36	}
39		37
		38	extern const struct x86_cpu_id x86_match_cpu(const struct x86_cpu_id match);
40	extern bool x86_cpu_has_min_microcode_rev(const struct x86_cpu_desc *table);	39	extern bool x86_cpu_has_min_microcode_rev(const struct x86_cpu_desc *table);
41		40
42	#endif	41	#endif /* _ASM_X86_CPU_DEVICE_ID */