lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Tue, 24 Mar 2020 22:32:14 -0000 From: "tip-bot2 for Thomas Gleixner" <tip-bot2@...utronix.de> To: linux-tip-commits@...r.kernel.org Cc: Thomas Gleixner <tglx@...utronix.de>, Borislav Petkov <bp@...e.de>, "Greg Kroah-Hartman" <gregkh@...uxfoundation.org>, x86 <x86@...nel.org>, LKML <linux-kernel@...r.kernel.org> Subject: [tip: x86/cpu] ASoC: Intel: Convert to new X86 CPU match macros The following commit has been merged into the x86/cpu branch of tip: Commit-ID: d51ba9c6663d7171681be357f672503f4e2ccdc1 Gitweb: https://git.kernel.org/tip/d51ba9c6663d7171681be357f672503f4e2ccdc1 Author: Thomas Gleixner <tglx@...utronix.de> AuthorDate: Fri, 20 Mar 2020 14:14:04 +01:00 Committer: Borislav Petkov <bp@...e.de> CommitterDate: Tue, 24 Mar 2020 21:35:53 +01: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@...utronix.de> Signed-off-by: Borislav Petkov <bp@...e.de> Reviewed-by: Greg Kroah-Hartman <gregkh@...uxfoundation.org> Link: https://lkml.kernel.org/r/20200320131510.594671507@linutronix.de --- sound/soc/intel/common/soc-intel-quirks.h | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/sound/soc/intel/common/soc-intel-quirks.h b/sound/soc/intel/common/soc-intel-quirks.h index 863a477..a917615 100644 --- a/sound/soc/intel/common/soc-intel-quirks.h +++ b/sound/soc/intel/common/soc-intel-quirks.h @@ -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) {
Powered by blists - more mailing lists