Skip to content

Commit

Permalink
hwmon: (w83795) Drop REST_VLT_BEGIN/END
Browse files Browse the repository at this point in the history
Get rid of REST_VLT_BEGIN and REST_VLT_END, they don't make the code
more readable.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
  • Loading branch information
Jean Delvare authored and Jean Delvare committed Oct 28, 2010
1 parent 7eb8d50 commit 49c7347
Showing 1 changed file with 3 additions and 6 deletions.
9 changes: 3 additions & 6 deletions drivers/hwmon/w83795.c
Original file line number Diff line number Diff line change
Expand Up @@ -175,10 +175,6 @@ static const u8 IN_LSB_SHIFT_IDX[][2] = {
};


/* 3VDD, 3VSB, VBAT * 0.006 */
#define REST_VLT_BEGIN 12 /* the 13th volt to 15th */
#define REST_VLT_END 14 /* the 13th volt to 15th */

#define W83795_REG_FAN(index) (0x2E + (index))
#define W83795_REG_FAN_MIN_HL(index) (0xB6 + (index))
#define W83795_REG_FAN_MIN_LSB(index) (0xC4 + (index) / 2)
Expand Down Expand Up @@ -250,15 +246,16 @@ static const u8 IN_LSB_SHIFT_IDX[][2] = {

static inline u16 in_from_reg(u8 index, u16 val)
{
if ((index >= REST_VLT_BEGIN) && (index <= REST_VLT_END))
/* 3VDD, 3VSB and VBAT: 6 mV/bit; other inputs: 2 mV/bit */
if (index >= 12 && index <= 14)
return val * 6;
else
return val * 2;
}

static inline u16 in_to_reg(u8 index, u16 val)
{
if ((index >= REST_VLT_BEGIN) && (index <= REST_VLT_END))
if (index >= 12 && index <= 14)
return val / 6;
else
return val / 2;
Expand Down

0 comments on commit 49c7347

Please sign in to comment.