lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

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

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Jean Delvare
2005-07-31 21:54:28 +02:00
committed by Greg Kroah-Hartman
parent 303760b44a
commit da97a5a327
1 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/hwmon/hwmon-vid.c
View File

@@ -38,14 +38,14 @@ static struct vrm_model vrm_models[] = {
{X86_VENDOR_AMD, 0x6, ANY, 90}, /* Athlon Duron etc */ {X86_VENDOR_AMD, 0x6, ANY, 90}, /* Athlon Duron etc */
{X86_VENDOR_AMD, 0xF, ANY, 24}, /* Athlon 64, Opteron */ {X86_VENDOR_AMD, 0xF, ANY, 24}, /* Athlon 64, Opteron */
{X86_VENDOR_INTEL, 0x6, 0x9, 85}, /* 0.13um too */ {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, 0x6, ANY, 82}, /* any P6 */
{X86_VENDOR_INTEL, 0x7, ANY, 0}, /* Itanium */ {X86_VENDOR_INTEL, 0x7, ANY, 0}, /* Itanium */
{X86_VENDOR_INTEL, 0xF, 0x3, 100}, /* P4 Prescott */ {X86_VENDOR_INTEL, 0xF, 0x3, 100}, /* P4 Prescott */
{X86_VENDOR_INTEL, 0xF, ANY, 90}, /* P4 before Prescott */ {X86_VENDOR_INTEL, 0xF, ANY, 90}, /* P4 before Prescott */
{X86_VENDOR_INTEL, 0x10,ANY, 0}, /* Itanium 2 */ {X86_VENDOR_INTEL, 0x10,ANY, 0}, /* Itanium 2 */
{X86_VENDOR_UNKNOWN, ANY, ANY, 0} /* stop here */ {X86_VENDOR_UNKNOWN, ANY, ANY, 0} /* stop here */
}; };
static int find_vrm(u8 eff_family, u8 eff_model, u8 vendor) static int find_vrm(u8 eff_family, u8 eff_model, u8 vendor)
{ {
@@ -53,8 +53,8 @@ static int find_vrm(u8 eff_family, u8 eff_model, u8 vendor)
while (vrm_models[i].vendor!=X86_VENDOR_UNKNOWN) { while (vrm_models[i].vendor!=X86_VENDOR_UNKNOWN) {
if (vrm_models[i].vendor==vendor) if (vrm_models[i].vendor==vendor)
if ((vrm_models[i].eff_family==eff_family)&& \ if ((vrm_models[i].eff_family==eff_family)
((vrm_models[i].eff_model==eff_model)|| \ && ((vrm_models[i].eff_model==eff_model) ||
(vrm_models[i].eff_model==ANY))) (vrm_models[i].eff_model==ANY)))
return vrm_models[i].vrm_type; return vrm_models[i].vrm_type;
i++; i++;
@@ -70,8 +70,9 @@ int vid_which_vrm(void)
u8 eff_family, eff_model; u8 eff_family, eff_model;
int vrm_ret; int vrm_ret;
if (c->x86 < 6) return 0; /* any CPU with familly lower than 6 if (c->x86 < 6) /* Any CPU with family lower than 6 */
dont have VID and/or CPUID */ return 0; /* doesn't have VID and/or CPUID */
eax = cpuid_eax(1); eax = cpuid_eax(1);
eff_family = ((eax & 0x00000F00)>>8); eff_family = ((eax & 0x00000F00)>>8);
eff_model = ((eax & 0x000000F0)>>4); eff_model = ((eax & 0x000000F0)>>4);
@@ -81,12 +82,12 @@ int vid_which_vrm(void)
} }
vrm_ret = find_vrm(eff_family,eff_model,c->x86_vendor); vrm_ret = find_vrm(eff_family,eff_model,c->x86_vendor);
if (vrm_ret == 0) if (vrm_ret == 0)
printk(KERN_INFO "hwmon-vid: Unknown VRM version of your" printk(KERN_INFO "hwmon-vid: Unknown VRM version of your "
" x86 CPU\n"); "x86 CPU\n");
return vrm_ret; return vrm_ret;
} }
/* and now for something completely different for Non-x86 world*/ /* and now something completely different for the non-x86 world */
#else #else
int vid_which_vrm(void) int vid_which_vrm(void)
{ {