Commit 9595198f authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Borislav Petkov
Browse files

x86/platform: Convert to new CPU match macros 



The new macro set has a consistent namespace and uses C99 initializers
instead of the grufty C89 ones.

Get rid the of the local macro wrappers for consistency.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
Reviewed-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Link: https://lkml.kernel.org/r/20200320131509.359448901@linutronix.de
parent adefe55e

arch/x86/platform/atom/punit_atom_debug.c

+6 −7
Original line number Diff line number Diff line
@@ -117,17 +117,16 @@ static void punit_dbgfs_unregister(void) 
	debugfs_remove_recursive(punit_dbg_file);

}



#define ICPU(model, drv_data) \

	{ X86_VENDOR_INTEL, 6, model, X86_FEATURE_MWAIT,\

	  (kernel_ulong_t)&drv_data }

#define X86_MATCH(model, data)						 \

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

					   X86_FEATURE_MWAIT, data)



static const struct x86_cpu_id intel_punit_cpu_ids[] = {

	ICPU(INTEL_FAM6_ATOM_SILVERMONT, punit_device_byt),

	ICPU(INTEL_FAM6_ATOM_SILVERMONT_MID,  punit_device_tng),

	ICPU(INTEL_FAM6_ATOM_AIRMONT,	  punit_device_cht),

	X86_MATCH(ATOM_SILVERMONT,		&punit_device_byt),

	X86_MATCH(ATOM_SILVERMONT_MID,		&punit_device_tng),

	X86_MATCH(ATOM_AIRMONT,			&punit_device_cht),

	{}

};



MODULE_DEVICE_TABLE(x86cpu, intel_punit_cpu_ids);



static int __init punit_atom_debug_init(void)

arch/x86/platform/efi/quirks.c

+2 −5
Original line number Diff line number Diff line
@@ -659,12 +659,9 @@ static int qrk_capsule_setup_info(struct capsule_info *cap_info, void **pkbuff, 
	return 1;

}



#define ICPU(family, model, quirk_handler) \

	{ X86_VENDOR_INTEL, family, model, X86_FEATURE_ANY, \

	  (unsigned long)&quirk_handler }



static const struct x86_cpu_id efi_capsule_quirk_ids[] = {

	ICPU(5, 9, qrk_capsule_setup_info),	/* Intel Quark X1000 */

	X86_MATCH_VENDOR_FAM_MODEL(INTEL, 5, INTEL_FAM5_QUARK_X1000,

				   &qrk_capsule_setup_info),

	{ }

};

arch/x86/platform/intel-mid/device_libs/platform_bt.c

+1 −4
Original line number Diff line number Diff line
@@ -60,11 +60,8 @@ static struct bt_sfi_data tng_bt_sfi_data __initdata = { 
	.setup	= tng_bt_sfi_setup,

};



#define ICPU(model, ddata)	\

	{ X86_VENDOR_INTEL, 6, model, X86_FEATURE_ANY, (kernel_ulong_t)&ddata }



static const struct x86_cpu_id bt_sfi_cpu_ids[] = {

	ICPU(INTEL_FAM6_ATOM_SILVERMONT_MID, tng_bt_sfi_data),

	X86_MATCH_INTEL_FAM6_MODEL(ATOM_SILVERMONT_MID,	&tng_bt_sfi_data),

	{}

};

arch/x86/platform/intel-quark/imr.c

+1 −1
Original line number Diff line number Diff line
@@ -569,7 +569,7 @@ static void __init imr_fixup_memmap(struct imr_device *idev) 
}



static const struct x86_cpu_id imr_ids[] __initconst = {

	{ X86_VENDOR_INTEL, 5, 9 },	/* Intel Quark SoC X1000. */

	X86_MATCH_VENDOR_FAM_MODEL(INTEL, 5, INTEL_FAM5_QUARK_X1000, NULL),

	{}

};

arch/x86/platform/intel-quark/imr_selftest.c

+1 −1
Original line number Diff line number Diff line
@@ -105,7 +105,7 @@ static void __init imr_self_test(void) 
}



static const struct x86_cpu_id imr_ids[] __initconst = {

	{ X86_VENDOR_INTEL, 5, 9 },	/* Intel Quark SoC X1000. */

	X86_MATCH_VENDOR_FAM_MODEL(INTEL, 5, INTEL_FAM5_QUARK_X1000, NULL),

	{}

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE