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

platform/x86: 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 avatarAndy Shevchenko <andy.shevchenko@gmail.com>
Reviewed-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Link: https://lkml.kernel.org/r/20200320131509.766573641@linutronix.de
parent 29842621

drivers/platform/x86/intel-uncore-frequency.c

+6 −8
Original line number Diff line number Diff line
@@ -358,15 +358,13 @@ static struct notifier_block uncore_pm_nb = { 
	.notifier_call = uncore_pm_notify,

};



#define ICPU(model)     { X86_VENDOR_INTEL, 6, model, X86_FEATURE_ANY, }



static const struct x86_cpu_id intel_uncore_cpu_ids[] = {

	ICPU(INTEL_FAM6_BROADWELL_G),

	ICPU(INTEL_FAM6_BROADWELL_X),

	ICPU(INTEL_FAM6_BROADWELL_D),

	ICPU(INTEL_FAM6_SKYLAKE_X),

	ICPU(INTEL_FAM6_ICELAKE_X),

	ICPU(INTEL_FAM6_ICELAKE_D),

	X86_MATCH_INTEL_FAM6_MODEL(BROADWELL_G,	NULL),

	X86_MATCH_INTEL_FAM6_MODEL(BROADWELL_X,	NULL),

	X86_MATCH_INTEL_FAM6_MODEL(BROADWELL_D,	NULL),

	X86_MATCH_INTEL_FAM6_MODEL(SKYLAKE_X,	NULL),

	X86_MATCH_INTEL_FAM6_MODEL(ICELAKE_X,	NULL),

	X86_MATCH_INTEL_FAM6_MODEL(ICELAKE_D,	NULL),

	{}

};

drivers/platform/x86/intel_int0002_vgpio.c

+2 −2
Original line number Diff line number Diff line
@@ -148,8 +148,8 @@ static struct irq_chip int0002_cht_irqchip = { 
};



static const struct x86_cpu_id int0002_cpu_ids[] = {

	INTEL_CPU_FAM6(ATOM_SILVERMONT, int0002_byt_irqchip),	/* Valleyview, Bay Trail  */

	INTEL_CPU_FAM6(ATOM_AIRMONT, int0002_cht_irqchip),	/* Braswell, Cherry Trail */

	X86_MATCH_INTEL_FAM6_MODEL(ATOM_SILVERMONT,	&int0002_byt_irqchip),

	X86_MATCH_INTEL_FAM6_MODEL(ATOM_AIRMONT,	&int0002_cht_irqchip),

	{}

};

drivers/platform/x86/intel_mid_powerbtn.c

+2 −2
Original line number Diff line number Diff line
@@ -113,8 +113,8 @@ static const struct mid_pb_ddata mrfld_ddata = { 
};



static const struct x86_cpu_id mid_pb_cpu_ids[] = {

	INTEL_CPU_FAM6(ATOM_SALTWELL_MID,	mfld_ddata),

	INTEL_CPU_FAM6(ATOM_SILVERMONT_MID,	mrfld_ddata),

	X86_MATCH_INTEL_FAM6_MODEL(ATOM_SALTWELL_MID,	&mfld_ddata),

	X86_MATCH_INTEL_FAM6_MODEL(ATOM_SILVERMONT_MID,	&mrfld_ddata),

	{}

};

drivers/platform/x86/intel_pmc_core.c

+12 −12
Original line number Diff line number Diff line
@@ -871,18 +871,18 @@ static inline void pmc_core_dbgfs_unregister(struct pmc_dev *pmcdev) 
#endif /* CONFIG_DEBUG_FS */



static const struct x86_cpu_id intel_pmc_core_ids[] = {

	INTEL_CPU_FAM6(SKYLAKE_L, spt_reg_map),

	INTEL_CPU_FAM6(SKYLAKE, spt_reg_map),

	INTEL_CPU_FAM6(KABYLAKE_L, spt_reg_map),

	INTEL_CPU_FAM6(KABYLAKE, spt_reg_map),

	INTEL_CPU_FAM6(CANNONLAKE_L, cnp_reg_map),

	INTEL_CPU_FAM6(ICELAKE_L, icl_reg_map),

	INTEL_CPU_FAM6(ICELAKE_NNPI, icl_reg_map),

	INTEL_CPU_FAM6(COMETLAKE, cnp_reg_map),

	INTEL_CPU_FAM6(COMETLAKE_L, cnp_reg_map),

	INTEL_CPU_FAM6(TIGERLAKE_L, tgl_reg_map),

	INTEL_CPU_FAM6(TIGERLAKE, tgl_reg_map),

	INTEL_CPU_FAM6(ATOM_TREMONT, tgl_reg_map),

	X86_MATCH_INTEL_FAM6_MODEL(SKYLAKE_L,		&spt_reg_map),

	X86_MATCH_INTEL_FAM6_MODEL(SKYLAKE,		&spt_reg_map),

	X86_MATCH_INTEL_FAM6_MODEL(KABYLAKE_L,		&spt_reg_map),

	X86_MATCH_INTEL_FAM6_MODEL(KABYLAKE,		&spt_reg_map),

	X86_MATCH_INTEL_FAM6_MODEL(CANNONLAKE_L,	&cnp_reg_map),

	X86_MATCH_INTEL_FAM6_MODEL(ICELAKE_L,		&icl_reg_map),

	X86_MATCH_INTEL_FAM6_MODEL(ICELAKE_NNPI,	&icl_reg_map),

	X86_MATCH_INTEL_FAM6_MODEL(COMETLAKE,		&cnp_reg_map),

	X86_MATCH_INTEL_FAM6_MODEL(COMETLAKE_L,		&cnp_reg_map),

	X86_MATCH_INTEL_FAM6_MODEL(TIGERLAKE_L,		&tgl_reg_map),

	X86_MATCH_INTEL_FAM6_MODEL(TIGERLAKE,		&tgl_reg_map),

	X86_MATCH_INTEL_FAM6_MODEL(ATOM_TREMONT,	&tgl_reg_map),

	{}

};

drivers/platform/x86/intel_pmc_core_pltdrv.c

+8 −8
Original line number Diff line number Diff line
@@ -38,14 +38,14 @@ static struct platform_device pmc_core_device = { 
 * other list may grow, but this list should not.

 */

static const struct x86_cpu_id intel_pmc_core_platform_ids[] = {

	INTEL_CPU_FAM6(SKYLAKE_L, pmc_core_device),

	INTEL_CPU_FAM6(SKYLAKE, pmc_core_device),

	INTEL_CPU_FAM6(KABYLAKE_L, pmc_core_device),

	INTEL_CPU_FAM6(KABYLAKE, pmc_core_device),

	INTEL_CPU_FAM6(CANNONLAKE_L, pmc_core_device),

	INTEL_CPU_FAM6(ICELAKE_L, pmc_core_device),

	INTEL_CPU_FAM6(COMETLAKE, pmc_core_device),

	INTEL_CPU_FAM6(COMETLAKE_L, pmc_core_device),

	X86_MATCH_INTEL_FAM6_MODEL(SKYLAKE_L,		&pmc_core_device),

	X86_MATCH_INTEL_FAM6_MODEL(SKYLAKE,		&pmc_core_device),

	X86_MATCH_INTEL_FAM6_MODEL(KABYLAKE_L,		&pmc_core_device),

	X86_MATCH_INTEL_FAM6_MODEL(KABYLAKE,		&pmc_core_device),

	X86_MATCH_INTEL_FAM6_MODEL(CANNONLAKE_L,	&pmc_core_device),

	X86_MATCH_INTEL_FAM6_MODEL(ICELAKE_L,		&pmc_core_device),

	X86_MATCH_INTEL_FAM6_MODEL(COMETLAKE,		&pmc_core_device),

	X86_MATCH_INTEL_FAM6_MODEL(COMETLAKE_L,		&pmc_core_device),

	{}

};

MODULE_DEVICE_TABLE(x86cpu, intel_pmc_core_platform_ids);

CRA Git | Maintained and supported by SUSTech CRA and CCSE