1 files changed, 20 insertions, 32 deletions

diff --git a/drivers/power/supply/max17040_battery.c b/drivers/power/supply/max17040_battery.c
index 8689c80202b5..e7c3649b31a0 100644
--- a/drivers/power/supply/max17040_battery.c
+++ b/drivers/power/supply/max17040_battery.c
@@ -21,18 +21,13 @@
 #include <linux/max17040_battery.h>
 #include <linux/slab.h>
 
-#define MAX17040_VCELL_MSB      0x02
-#define MAX17040_VCELL_LSB      0x03
-#define MAX17040_SOC_MSB        0x04
-#define MAX17040_SOC_LSB        0x05
-#define MAX17040_MODE_MSB       0x06
-#define MAX17040_MODE_LSB       0x07
-#define MAX17040_VER_MSB        0x08
-#define MAX17040_VER_LSB        0x09
-#define MAX17040_RCOMP_MSB      0x0C
-#define MAX17040_RCOMP_LSB      0x0D
-#define MAX17040_CMD_MSB        0xFE
-#define MAX17040_CMD_LSB        0xFF
+#define MAX17040_VCELL  0x02
+#define MAX17040_SOC    0x04
+#define MAX17040_MODE   0x06
+#define MAX17040_VER    0x08
+#define MAX17040_RCOMP  0x0C
+#define MAX17040_CMD    0xFE
+
 
 #define MAX17040_DELAY          1000
 #define MAX17040_BATTERY_FULL   95
@@ -78,11 +73,11 @@ static int max17040_get_property(struct power_supply *psy,
         return 0;
 }
 
-static int max17040_write_reg(struct i2c_client *client, int reg, u8 value)
+static int max17040_write_reg(struct i2c_client *client, int reg, u16 value)
 {
         int ret;
 
-        ret = i2c_smbus_write_byte_data(client, reg, value);
+        ret = i2c_smbus_write_word_swapped(client, reg, value);
 
         if (ret < 0)
                 dev_err(&client->dev, "%s: err %d\n", __func__, ret);
@@ -94,7 +89,7 @@ static int max17040_read_reg(struct i2c_client *client, int reg)
 {
         int ret;
 
-        ret = i2c_smbus_read_byte_data(client, reg);
+        ret = i2c_smbus_read_word_swapped(client, reg);
 
         if (ret < 0)
                 dev_err(&client->dev, "%s: err %d\n", __func__, ret);
@@ -104,43 +99,36 @@ static int max17040_read_reg(struct i2c_client *client, int reg)
 
 static void max17040_reset(struct i2c_client *client)
 {
-        max17040_write_reg(client, MAX17040_CMD_MSB, 0x54);
-        max17040_write_reg(client, MAX17040_CMD_LSB, 0x00);
+        max17040_write_reg(client, MAX17040_CMD, 0x0054);
 }
 
 static void max17040_get_vcell(struct i2c_client *client)
 {
         struct max17040_chip *chip = i2c_get_clientdata(client);
-        u8 msb;
-        u8 lsb;
+        u16 vcell;
 
-        msb = max17040_read_reg(client, MAX17040_VCELL_MSB);
-        lsb = max17040_read_reg(client, MAX17040_VCELL_LSB);
+        vcell = max17040_read_reg(client, MAX17040_VCELL);
 
-        chip->vcell = (msb << 4) + (lsb >> 4);
+        chip->vcell = vcell;
 }
 
 static void max17040_get_soc(struct i2c_client *client)
 {
         struct max17040_chip *chip = i2c_get_clientdata(client);
-        u8 msb;
-        u8 lsb;
+        u16 soc;
 
-        msb = max17040_read_reg(client, MAX17040_SOC_MSB);
-        lsb = max17040_read_reg(client, MAX17040_SOC_LSB);
+        soc = max17040_read_reg(client, MAX17040_SOC);
 
-        chip->soc = msb;
+        chip->soc = (soc >> 8);
 }
 
 static void max17040_get_version(struct i2c_client *client)
 {
-        u8 msb;
-        u8 lsb;
+        u16 version;
 
-        msb = max17040_read_reg(client, MAX17040_VER_MSB);
-        lsb = max17040_read_reg(client, MAX17040_VER_LSB);
+        version = max17040_read_reg(client, MAX17040_VER);
 
-        dev_info(&client->dev, "MAX17040 Fuel-Gauge Ver %d%d\n", msb, lsb);
+        dev_info(&client->dev, "MAX17040 Fuel-Gauge Ver 0x%x\n", version);
 }
 
 static void max17040_get_online(struct i2c_client *client)