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: Fri, 20 Mar 2020 14:13:57 +0100 From: Thomas Gleixner <tglx@...utronix.de> To: LKML <linux-kernel@...r.kernel.org> Cc: x86@...nel.org, Greg Kroah-Hartman <gregkh@...uxfoundation.org>, Mark Gross <mgross@...ux.intel.com>, Tony Luck <tony.luck@...el.com>, Jean Delvare <jdelvare@...e.com>, Guenter Roeck <linux@...ck-us.net>, linux-hwmon@...r.kernel.org, Paolo Bonzini <pbonzini@...hat.com>, Darren Hart <dvhart@...radead.org>, Andy Shevchenko <andy@...radead.org>, "Rafael J. Wysocki" <rjw@...ysocki.net>, Len Brown <lenb@...nel.org>, linux-acpi@...r.kernel.org, Viresh Kumar <viresh.kumar@...aro.org>, linux-pm@...r.kernel.org, Srinivas Pandruvada <srinivas.pandruvada@...ux.intel.com>, linux-edac@...r.kernel.org, platform-driver-x86@...r.kernel.org, Zhang Rui <rui.zhang@...el.com>, Daniel Lezcano <daniel.lezcano@...aro.org>, Amit Kucheria <amit.kucheria@...durent.com>, Chanwoo Choi <cw00.choi@...sung.com>, Jacob Pan <jacob.jun.pan@...ux.intel.com>, Adrian Hunter <adrian.hunter@...el.com>, Ulf Hansson <ulf.hansson@...aro.org>, linux-mmc@...r.kernel.org, Bjorn Helgaas <bhelgaas@...gle.com>, linux-pci@...r.kernel.org, Takashi Iwai <tiwai@...e.com>, alsa-devel@...a-project.org, Herbert Xu <herbert@...dor.apana.org.au>, "David S. Miller" <davem@...emloft.net>, linux-crypto@...r.kernel.org Subject: [patch 12/22] hwmon: 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. Signed-off-by: Thomas Gleixner <tglx@...utronix.de> Cc: Jean Delvare <jdelvare@...e.com> Cc: Guenter Roeck <linux@...ck-us.net> Cc: linux-hwmon@...r.kernel.org --- drivers/hwmon/coretemp.c | 2 +- drivers/hwmon/via-cputemp.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) --- a/drivers/hwmon/coretemp.c +++ b/drivers/hwmon/coretemp.c @@ -709,7 +709,7 @@ static int coretemp_cpu_offline(unsigned return 0; } static const struct x86_cpu_id __initconst coretemp_ids[] = { - { X86_VENDOR_INTEL, X86_FAMILY_ANY, X86_MODEL_ANY, X86_FEATURE_DTHERM }, + X86_MATCH_VENDOR_FEATURE(INTEL, X86_FEATURE_DTHERM, NULL), {} }; MODULE_DEVICE_TABLE(x86cpu, coretemp_ids); --- a/drivers/hwmon/via-cputemp.c +++ b/drivers/hwmon/via-cputemp.c @@ -270,10 +270,10 @@ static int via_cputemp_down_prep(unsigne } static const struct x86_cpu_id __initconst cputemp_ids[] = { - { X86_VENDOR_CENTAUR, 6, 0xa, }, /* C7 A */ - { X86_VENDOR_CENTAUR, 6, 0xd, }, /* C7 D */ - { X86_VENDOR_CENTAUR, 6, 0xf, }, /* Nano */ - { X86_VENDOR_CENTAUR, 7, X86_MODEL_ANY, }, + X86_MATCH_VENDOR_FAM_MODEL(CENTAUR, 6, X86_CENTAUR_FAM6_C7_A, NULL), + X86_MATCH_VENDOR_FAM_MODEL(CENTAUR, 6, X86_CENTAUR_FAM6_C7_D, NULL), + X86_MATCH_VENDOR_FAM_MODEL(CENTAUR, 6, X86_CENTAUR_FAM6_NANO, NULL), + X86_MATCH_VENDOR_FAM_MODEL(CENTAUR, 7, X86_MODEL_ANY, NULL), {} }; MODULE_DEVICE_TABLE(x86cpu, cputemp_ids);
Powered by blists - more mailing lists