diff options
author | Jonathan Cameron <jic23@cam.ac.uk> | 2011-11-29 14:23:27 -0500 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2011-12-01 02:41:44 -0500 |
commit | 75255b29d473613e2a5737d6fb368dc4009c90a8 (patch) | |
tree | c045c4dfa491dee839b864ac0d55b38166754a4f /drivers | |
parent | cdcc96e261909eccf596c070116c8b906a42b328 (diff) |
Input: ad7879-i2c - use swapped variant of i2c_smbus_read_word_data
This variant was introduced in
i2c: boilerplate function for byte swapped smbus_write/read_word_data
This also has the side effect of ensuring any errors from the i2c
read and no longer mangled.
Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
Acked-by: Michael Hennerich <michael.hennerich@analog.com>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/input/touchscreen/ad7879-i2c.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/input/touchscreen/ad7879-i2c.c b/drivers/input/touchscreen/ad7879-i2c.c index b746702a8551..0dac6712f42b 100644 --- a/drivers/input/touchscreen/ad7879-i2c.c +++ b/drivers/input/touchscreen/ad7879-i2c.c | |||
@@ -23,7 +23,7 @@ static int ad7879_i2c_read(struct device *dev, u8 reg) | |||
23 | { | 23 | { |
24 | struct i2c_client *client = to_i2c_client(dev); | 24 | struct i2c_client *client = to_i2c_client(dev); |
25 | 25 | ||
26 | return swab16(i2c_smbus_read_word_data(client, reg)); | 26 | return i2c_smbus_read_word_swapped(client, reg); |
27 | } | 27 | } |
28 | 28 | ||
29 | static int ad7879_i2c_multi_read(struct device *dev, | 29 | static int ad7879_i2c_multi_read(struct device *dev, |
@@ -44,7 +44,7 @@ static int ad7879_i2c_write(struct device *dev, u8 reg, u16 val) | |||
44 | { | 44 | { |
45 | struct i2c_client *client = to_i2c_client(dev); | 45 | struct i2c_client *client = to_i2c_client(dev); |
46 | 46 | ||
47 | return i2c_smbus_write_word_data(client, reg, swab16(val)); | 47 | return i2c_smbus_write_word_swapped(client, reg, val); |
48 | } | 48 | } |
49 | 49 | ||
50 | static const struct ad7879_bus_ops ad7879_i2c_bus_ops = { | 50 | static const struct ad7879_bus_ops ad7879_i2c_bus_ops = { |