mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-24 01:41:39 +00:00
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: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Borislav Petkov <bp@suse.de> Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Link: https://lkml.kernel.org/r/20200320131510.594671507@linutronix.de
This commit is contained in:
parent
f072251288
commit
d51ba9c666
1 changed files with 6 additions and 8 deletions
|
@ -15,13 +15,11 @@
|
||||||
#include <asm/intel-family.h>
|
#include <asm/intel-family.h>
|
||||||
#include <asm/iosf_mbi.h>
|
#include <asm/iosf_mbi.h>
|
||||||
|
|
||||||
#define ICPU(model) { X86_VENDOR_INTEL, 6, model, X86_FEATURE_ANY, }
|
|
||||||
|
|
||||||
#define SOC_INTEL_IS_CPU(soc, type) \
|
#define SOC_INTEL_IS_CPU(soc, type) \
|
||||||
static inline bool soc_intel_is_##soc(void) \
|
static inline bool soc_intel_is_##soc(void) \
|
||||||
{ \
|
{ \
|
||||||
static const struct x86_cpu_id soc##_cpu_ids[] = { \
|
static const struct x86_cpu_id soc##_cpu_ids[] = { \
|
||||||
ICPU(type), \
|
X86_MATCH_INTEL_FAM6_MODEL(type, NULL), \
|
||||||
{} \
|
{} \
|
||||||
}; \
|
}; \
|
||||||
const struct x86_cpu_id *id; \
|
const struct x86_cpu_id *id; \
|
||||||
|
@ -32,11 +30,11 @@ static inline bool soc_intel_is_##soc(void) \
|
||||||
return false; \
|
return false; \
|
||||||
}
|
}
|
||||||
|
|
||||||
SOC_INTEL_IS_CPU(byt, INTEL_FAM6_ATOM_SILVERMONT);
|
SOC_INTEL_IS_CPU(byt, ATOM_SILVERMONT);
|
||||||
SOC_INTEL_IS_CPU(cht, INTEL_FAM6_ATOM_AIRMONT);
|
SOC_INTEL_IS_CPU(cht, ATOM_AIRMONT);
|
||||||
SOC_INTEL_IS_CPU(apl, INTEL_FAM6_ATOM_GOLDMONT);
|
SOC_INTEL_IS_CPU(apl, ATOM_GOLDMONT);
|
||||||
SOC_INTEL_IS_CPU(glk, INTEL_FAM6_ATOM_GOLDMONT_PLUS);
|
SOC_INTEL_IS_CPU(glk, ATOM_GOLDMONT_PLUS);
|
||||||
SOC_INTEL_IS_CPU(cml, INTEL_FAM6_KABYLAKE_L);
|
SOC_INTEL_IS_CPU(cml, KABYLAKE_L);
|
||||||
|
|
||||||
static inline bool soc_intel_is_byt_cr(struct platform_device *pdev)
|
static inline bool soc_intel_is_byt_cr(struct platform_device *pdev)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in a new issue