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, 22 deletions

diff --git a/drivers/hwmon/sht21.c b/drivers/hwmon/sht21.c
index 1c8c9812f244..15398780cc00 100644
--- a/drivers/hwmon/sht21.c
+++ b/drivers/hwmon/sht21.c
@@ -83,25 +83,6 @@ static inline int sht21_rh_ticks_to_per_cent_mille(int ticks)
 }
 
 /**
- * sht21_read_word_data() - read word from register
- * @client: I2C client device
- * @reg: I2C command byte
- *
- * Returns value, negative errno on error.
- */
-static inline int sht21_read_word_data(struct i2c_client *client, u8 reg)
-{
-        int ret = i2c_smbus_read_word_data(client, reg);
-        if (ret < 0)
-                return ret;
-        /*
-         * SMBus specifies low byte first, but the SHT21 returns MSB
-         * first, so we have to swab16 the values
-         */
-        return swab16(ret);
-}
-
-/**
  * sht21_update_measurements() - get updated measurements from device
  * @client: I2C client device
  *
@@ -119,12 +100,13 @@ static int sht21_update_measurements(struct i2c_client *client)
          * maximum two measurements per second at 12bit accuracy shall be made.
          */
         if (time_after(jiffies, sht21->last_update + HZ / 2) || !sht21->valid) {
-                ret = sht21_read_word_data(client, SHT21_TRIG_T_MEASUREMENT_HM);
+                ret = i2c_smbus_read_word_swapped(client,
+                                                  SHT21_TRIG_T_MEASUREMENT_HM);
                 if (ret < 0)
                         goto out;
                 sht21->temperature = sht21_temp_ticks_to_millicelsius(ret);
-                ret = sht21_read_word_data(client,
-                                        SHT21_TRIG_RH_MEASUREMENT_HM);
+                ret = i2c_smbus_read_word_swapped(client,
+                                                  SHT21_TRIG_RH_MEASUREMENT_HM);
                 if (ret < 0)
                         goto out;
                 sht21->humidity = sht21_rh_ticks_to_per_cent_mille(ret);