Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 292218
b: refs/heads/master
c: f352df6
h: refs/heads/master
v: v3
  • Loading branch information
Guenter Roeck authored and Guenter Roeck committed Mar 19, 2012
1 parent 2bb347e commit 94167a1
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 11 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 3230f7049e6325c27d6d40f2a1547cf75bc4ddff
refs/heads/master: f352df652ff37c434ed32bc5b7eb7ce430b73abc
18 changes: 8 additions & 10 deletions trunk/drivers/hwmon/hwmon-vid.c
Original file line number Diff line number Diff line change
Expand Up @@ -83,18 +83,18 @@ int vid_from_reg(int val, u8 vrm)
{
int vid;

switch(vrm) {
switch (vrm) {

case 100: /* VRD 10.0 */
case 100: /* VRD 10.0 */
/* compute in uV, round to mV */
val &= 0x3f;
if((val & 0x1f) == 0x1f)
if ((val & 0x1f) == 0x1f)
return 0;
if((val & 0x1f) <= 0x09 || val == 0x0a)
if ((val & 0x1f) <= 0x09 || val == 0x0a)
vid = 1087500 - (val & 0x1f) * 25000;
else
vid = 1862500 - (val & 0x1f) * 25000;
if(val & 0x20)
if (val & 0x20)
vid -= 12500;
return (vid + 500) / 1000;

Expand All @@ -119,7 +119,7 @@ int vid_from_reg(int val, u8 vrm)
case 90: /* VRM 9.0 */
val &= 0x1f;
return val == 0x1f ? 0 :
1850 - val * 25;
1850 - val * 25;

case 85: /* VRM 8.5 */
val &= 0x1f;
Expand All @@ -134,7 +134,7 @@ int vid_from_reg(int val, u8 vrm)
val &= 0x1f;
return val == 0x1f ? 0 :
val & 0x10 ? 5100 - (val) * 100 :
2050 - (val) * 50;
2050 - (val) * 50;
case 17: /* Intel IMVP-II */
val &= 0x1f;
return val & 0x10 ? 975 - (val & 0xF) * 25 :
Expand All @@ -157,7 +157,7 @@ int vid_from_reg(int val, u8 vrm)
return 0;
}
}

EXPORT_SYMBOL(vid_from_reg);

/*
* After this point is the code to automatically determine which
Expand Down Expand Up @@ -299,8 +299,6 @@ u8 vid_which_vrm(void)
return 0;
}
#endif

EXPORT_SYMBOL(vid_from_reg);
EXPORT_SYMBOL(vid_which_vrm);

MODULE_AUTHOR("Rudolf Marek <r.marek@assembler.cz>");
Expand Down

0 comments on commit 94167a1

Please sign in to comment.