hwmon: Use i2c_smbus_{read,write}_word_swapped

Make use of the new i2c_smbus_{read,write}_word_swapped functions.
This makes the driver code more compact and readable. It also ensures
proper error handling.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Acked-by: Jonathan Cameron <jic23@cam.ac.uk>
Acked-by: Guenter Roeck <guenter.roeck@ericsson.com>
Cc: Dirk Eibach <eibach@gdsys.de>
Cc: "Mark M. Hoffman" <mhoffman@lightlink.com>
Cc: Guillaume Ligneul <guillaume.ligneul@gmail.com>

1 files changed, 4 insertions, 17 deletions

diff --git a/drivers/hwmon/ads1015.c b/drivers/hwmon/ads1015.c
index e9beeda4cbe5..eedca3cf9968 100644
--- a/drivers/hwmon/ads1015.c
+++ b/drivers/hwmon/ads1015.c
@@ -59,19 +59,6 @@ struct ads1015_data {
         struct ads1015_channel_data channel_data[ADS1015_CHANNELS];
 };
 
-static s32 ads1015_read_reg(struct i2c_client *client, unsigned int reg)
-{
-        s32 data = i2c_smbus_read_word_data(client, reg);
-
-        return (data < 0) ? data : swab16(data);
-}
-
-static s32 ads1015_write_reg(struct i2c_client *client, unsigned int reg,
-                             u16 val)
-{
-        return i2c_smbus_write_word_data(client, reg, swab16(val));
-}
-
 static int ads1015_read_value(struct i2c_client *client, unsigned int channel,
                               int *value)
 {
@@ -87,7 +74,7 @@ static int ads1015_read_value(struct i2c_client *client, unsigned int channel,
         mutex_lock(&data->update_lock);
 
         /* get channel parameters */
-        res = ads1015_read_reg(client, ADS1015_CONFIG);
+        res = i2c_smbus_read_word_swapped(client, ADS1015_CONFIG);
         if (res < 0)
                 goto err_unlock;
         config = res;
@@ -101,13 +88,13 @@ static int ads1015_read_value(struct i2c_client *client, unsigned int channel,
         config |= (pga & 0x0007) << 9;
         config |= (data_rate & 0x0007) << 5;
 
-        res = ads1015_write_reg(client, ADS1015_CONFIG, config);
+        res = i2c_smbus_write_word_swapped(client, ADS1015_CONFIG, config);
         if (res < 0)
                 goto err_unlock;
 
         /* wait until conversion finished */
         msleep(conversion_time_ms);
-        res = ads1015_read_reg(client, ADS1015_CONFIG);
+        res = i2c_smbus_read_word_swapped(client, ADS1015_CONFIG);
         if (res < 0)
                 goto err_unlock;
         config = res;
@@ -117,7 +104,7 @@ static int ads1015_read_value(struct i2c_client *client, unsigned int channel,
                 goto err_unlock;
         }
 
-        res = ads1015_read_reg(client, ADS1015_CONVERSION);
+        res = i2c_smbus_read_word_swapped(client, ADS1015_CONVERSION);
         if (res < 0)
                 goto err_unlock;
         conversion = res;