Commit da97a5a3 authored by Jean Delvare's avatar Jean Delvare Committed by Greg Kroah-Hartman
Browse files

[PATCH] hwmon: hwmon vs i2c, second round (08/11) 



Cleanup hwmon-vid a bit, fixing typos, rewording some comments and
reindenting properly at places.

Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 303760b4

drivers/hwmon/hwmon-vid.c

+11 −10
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ static struct vrm_model vrm_models[] = { 
	{X86_VENDOR_AMD, 0x6, ANY, 90},		/* Athlon Duron etc */

	{X86_VENDOR_AMD, 0xF, ANY, 24},		/* Athlon 64, Opteron */

	{X86_VENDOR_INTEL, 0x6, 0x9, 85},	/* 0.13um too */

	{X86_VENDOR_INTEL, 0x6, 0xB, 85},	/* 0xB Tualatin */

	{X86_VENDOR_INTEL, 0x6, 0xB, 85},	/* Tualatin */

	{X86_VENDOR_INTEL, 0x6, ANY, 82},	/* any P6 */

	{X86_VENDOR_INTEL, 0x7, ANY, 0},	/* Itanium */

	{X86_VENDOR_INTEL, 0xF, 0x3, 100},	/* P4 Prescott */
@@ -53,8 +53,8 @@ static int find_vrm(u8 eff_family, u8 eff_model, u8 vendor) 


	while (vrm_models[i].vendor!=X86_VENDOR_UNKNOWN) {

		if (vrm_models[i].vendor==vendor)

			if ((vrm_models[i].eff_family==eff_family)&& \

			((vrm_models[i].eff_model==eff_model)|| \

			if ((vrm_models[i].eff_family==eff_family)

			 && ((vrm_models[i].eff_model==eff_model) ||

			     (vrm_models[i].eff_model==ANY)))

				return vrm_models[i].vrm_type;

		i++;
@@ -70,8 +70,9 @@ int vid_which_vrm(void) 
	u8 eff_family, eff_model;

	int vrm_ret;



	if (c->x86 < 6) return 0;	/* any CPU with familly lower than 6

				 	dont have VID and/or CPUID */

	if (c->x86 < 6)		/* Any CPU with family lower than 6 */

		return 0;	/* doesn't have VID and/or CPUID */



	eax = cpuid_eax(1);

	eff_family = ((eax & 0x00000F00)>>8);

	eff_model  = ((eax & 0x000000F0)>>4);
@@ -86,7 +87,7 @@ int vid_which_vrm(void) 
	return vrm_ret;

}



/* and now for something completely different for Non-x86 world*/

/* and now something completely different for the non-x86 world */

#else

int vid_which_vrm(void)

{