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

ASoC: Intel: Convert to new X86 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/20200320131510.594671507@linutronix.de
parent f0722512

sound/soc/intel/common/soc-intel-quirks.h

+6 −8
Original line number Diff line number Diff line
@@ -15,13 +15,11 @@ 
#include <asm/intel-family.h>

#include <asm/iosf_mbi.h>



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



#define SOC_INTEL_IS_CPU(soc, type)				\

static inline bool soc_intel_is_##soc(void)			\

{								\

	static const struct x86_cpu_id soc##_cpu_ids[] = {	\

		ICPU(type),					\

		X86_MATCH_INTEL_FAM6_MODEL(type, NULL),		\

		{}						\

	};							\

	const struct x86_cpu_id *id;				\
@@ -32,11 +30,11 @@ static inline bool soc_intel_is_##soc(void) \ 
	return false;						\

}



SOC_INTEL_IS_CPU(byt, INTEL_FAM6_ATOM_SILVERMONT);

SOC_INTEL_IS_CPU(cht, INTEL_FAM6_ATOM_AIRMONT);

SOC_INTEL_IS_CPU(apl, INTEL_FAM6_ATOM_GOLDMONT);

SOC_INTEL_IS_CPU(glk, INTEL_FAM6_ATOM_GOLDMONT_PLUS);

SOC_INTEL_IS_CPU(cml, INTEL_FAM6_KABYLAKE_L);

SOC_INTEL_IS_CPU(byt, ATOM_SILVERMONT);

SOC_INTEL_IS_CPU(cht, ATOM_AIRMONT);

SOC_INTEL_IS_CPU(apl, ATOM_GOLDMONT);

SOC_INTEL_IS_CPU(glk, ATOM_GOLDMONT_PLUS);

SOC_INTEL_IS_CPU(cml, KABYLAKE_L);



static inline bool soc_intel_is_byt_cr(struct platform_device *pdev)

{

CRA Git | Maintained and supported by SUSTech CRA and CCSE