diff options
author | Jean Delvare <khali@linux-fr.org> | 2005-07-31 15:54:28 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2005-09-05 12:14:22 -0400 |
commit | da97a5a3279340462e8be6612feabc4b28883f87 (patch) | |
tree | d4c40ea5d37cffc2316c0528a8d9807fe114abde /drivers/hwmon | |
parent | 303760b44a7a142cb9f4c9df4609fb63bbda98db (diff) |
[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: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/hwmon')
-rw-r--r-- | drivers/hwmon/hwmon-vid.c | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/drivers/hwmon/hwmon-vid.c b/drivers/hwmon/hwmon-vid.c index ce475c93f836..7c8ed0353302 100644 --- a/drivers/hwmon/hwmon-vid.c +++ b/drivers/hwmon/hwmon-vid.c | |||
@@ -38,14 +38,14 @@ static struct vrm_model vrm_models[] = { | |||
38 | {X86_VENDOR_AMD, 0x6, ANY, 90}, /* Athlon Duron etc */ | 38 | {X86_VENDOR_AMD, 0x6, ANY, 90}, /* Athlon Duron etc */ |
39 | {X86_VENDOR_AMD, 0xF, ANY, 24}, /* Athlon 64, Opteron */ | 39 | {X86_VENDOR_AMD, 0xF, ANY, 24}, /* Athlon 64, Opteron */ |
40 | {X86_VENDOR_INTEL, 0x6, 0x9, 85}, /* 0.13um too */ | 40 | {X86_VENDOR_INTEL, 0x6, 0x9, 85}, /* 0.13um too */ |
41 | {X86_VENDOR_INTEL, 0x6, 0xB, 85}, /* 0xB Tualatin */ | 41 | {X86_VENDOR_INTEL, 0x6, 0xB, 85}, /* Tualatin */ |
42 | {X86_VENDOR_INTEL, 0x6, ANY, 82}, /* any P6 */ | 42 | {X86_VENDOR_INTEL, 0x6, ANY, 82}, /* any P6 */ |
43 | {X86_VENDOR_INTEL, 0x7, ANY, 0}, /* Itanium */ | 43 | {X86_VENDOR_INTEL, 0x7, ANY, 0}, /* Itanium */ |
44 | {X86_VENDOR_INTEL, 0xF, 0x3, 100}, /* P4 Prescott */ | 44 | {X86_VENDOR_INTEL, 0xF, 0x3, 100}, /* P4 Prescott */ |
45 | {X86_VENDOR_INTEL, 0xF, ANY, 90}, /* P4 before Prescott */ | 45 | {X86_VENDOR_INTEL, 0xF, ANY, 90}, /* P4 before Prescott */ |
46 | {X86_VENDOR_INTEL, 0x10,ANY, 0}, /* Itanium 2 */ | 46 | {X86_VENDOR_INTEL, 0x10,ANY, 0}, /* Itanium 2 */ |
47 | {X86_VENDOR_UNKNOWN, ANY, ANY, 0} /* stop here */ | 47 | {X86_VENDOR_UNKNOWN, ANY, ANY, 0} /* stop here */ |
48 | }; | 48 | }; |
49 | 49 | ||
50 | static int find_vrm(u8 eff_family, u8 eff_model, u8 vendor) | 50 | static int find_vrm(u8 eff_family, u8 eff_model, u8 vendor) |
51 | { | 51 | { |
@@ -53,9 +53,9 @@ static int find_vrm(u8 eff_family, u8 eff_model, u8 vendor) | |||
53 | 53 | ||
54 | while (vrm_models[i].vendor!=X86_VENDOR_UNKNOWN) { | 54 | while (vrm_models[i].vendor!=X86_VENDOR_UNKNOWN) { |
55 | if (vrm_models[i].vendor==vendor) | 55 | if (vrm_models[i].vendor==vendor) |
56 | if ((vrm_models[i].eff_family==eff_family)&& \ | 56 | if ((vrm_models[i].eff_family==eff_family) |
57 | ((vrm_models[i].eff_model==eff_model)|| \ | 57 | && ((vrm_models[i].eff_model==eff_model) || |
58 | (vrm_models[i].eff_model==ANY))) | 58 | (vrm_models[i].eff_model==ANY))) |
59 | return vrm_models[i].vrm_type; | 59 | return vrm_models[i].vrm_type; |
60 | i++; | 60 | i++; |
61 | } | 61 | } |
@@ -70,8 +70,9 @@ int vid_which_vrm(void) | |||
70 | u8 eff_family, eff_model; | 70 | u8 eff_family, eff_model; |
71 | int vrm_ret; | 71 | int vrm_ret; |
72 | 72 | ||
73 | if (c->x86 < 6) return 0; /* any CPU with familly lower than 6 | 73 | if (c->x86 < 6) /* Any CPU with family lower than 6 */ |
74 | dont have VID and/or CPUID */ | 74 | return 0; /* doesn't have VID and/or CPUID */ |
75 | |||
75 | eax = cpuid_eax(1); | 76 | eax = cpuid_eax(1); |
76 | eff_family = ((eax & 0x00000F00)>>8); | 77 | eff_family = ((eax & 0x00000F00)>>8); |
77 | eff_model = ((eax & 0x000000F0)>>4); | 78 | eff_model = ((eax & 0x000000F0)>>4); |
@@ -81,12 +82,12 @@ int vid_which_vrm(void) | |||
81 | } | 82 | } |
82 | vrm_ret = find_vrm(eff_family,eff_model,c->x86_vendor); | 83 | vrm_ret = find_vrm(eff_family,eff_model,c->x86_vendor); |
83 | if (vrm_ret == 0) | 84 | if (vrm_ret == 0) |
84 | printk(KERN_INFO "hwmon-vid: Unknown VRM version of your" | 85 | printk(KERN_INFO "hwmon-vid: Unknown VRM version of your " |
85 | " x86 CPU\n"); | 86 | "x86 CPU\n"); |
86 | return vrm_ret; | 87 | return vrm_ret; |
87 | } | 88 | } |
88 | 89 | ||
89 | /* and now for something completely different for Non-x86 world*/ | 90 | /* and now something completely different for the non-x86 world */ |
90 | #else | 91 | #else |
91 | int vid_which_vrm(void) | 92 | int vid_which_vrm(void) |
92 | { | 93 | { |