git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
[pandora-kernel.git]
/
drivers
/
hwmon
/
asb100.c
diff --git
a/drivers/hwmon/asb100.c
b/drivers/hwmon/asb100.c
index
c02a052
..
d7bd1f3
100644
(file)
--- a/
drivers/hwmon/asb100.c
+++ b/
drivers/hwmon/asb100.c
@@
-829,17
+829,17
@@
static int asb100_read_value(struct i2c_client *client, u16 reg)
/* convert from ISA to LM75 I2C addresses */
switch (reg & 0xff) {
case 0x50: /* TEMP */
/* convert from ISA to LM75 I2C addresses */
switch (reg & 0xff) {
case 0x50: /* TEMP */
- res =
swab16(i2c_smbus_read_word_data(cl, 0)
);
+ res =
i2c_smbus_read_word_swapped(cl, 0
);
break;
case 0x52: /* CONFIG */
res = i2c_smbus_read_byte_data(cl, 1);
break;
case 0x53: /* HYST */
break;
case 0x52: /* CONFIG */
res = i2c_smbus_read_byte_data(cl, 1);
break;
case 0x53: /* HYST */
- res =
swab16(i2c_smbus_read_word_data(cl, 2)
);
+ res =
i2c_smbus_read_word_swapped(cl, 2
);
break;
case 0x55: /* MAX */
default:
break;
case 0x55: /* MAX */
default:
- res =
swab16(i2c_smbus_read_word_data(cl, 3)
);
+ res =
i2c_smbus_read_word_swapped(cl, 3
);
break;
}
}
break;
}
}
@@
-877,10
+877,10
@@
static void asb100_write_value(struct i2c_client *client, u16 reg, u16 value)
i2c_smbus_write_byte_data(cl, 1, value & 0xff);
break;
case 0x53: /* HYST */
i2c_smbus_write_byte_data(cl, 1, value & 0xff);
break;
case 0x53: /* HYST */
- i2c_smbus_write_word_
data(cl, 2, swab16(value)
);
+ i2c_smbus_write_word_
swapped(cl, 2, value
);
break;
case 0x55: /* MAX */
break;
case 0x55: /* MAX */
- i2c_smbus_write_word_
data(cl, 3, swab16(value)
);
+ i2c_smbus_write_word_
swapped(cl, 3, value
);
break;
}
}
break;
}
}