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

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: 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/20200320131509.859324598@linutronix.de
parent a69b3b1d

drivers/hwmon/coretemp.c

+1 −1
Original line number Diff line number Diff line
@@ -709,7 +709,7 @@ static int coretemp_cpu_offline(unsigned int cpu) 
	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);

drivers/hwmon/via-cputemp.c

+4 −4
Original line number Diff line number Diff line
@@ -270,10 +270,10 @@ static int via_cputemp_down_prep(unsigned int cpu) 
}



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);

CRA Git | Maintained and supported by SUSTech CRA and CCSE