2 files changed, 25 insertions, 33 deletions

diff --git a/drivers/input/misc/ad714x-i2c.c b/drivers/input/misc/ad714x-i2c.c
index e21deb1baa8a..00a6a223212a 100644
--- a/drivers/input/misc/ad714x-i2c.c
+++ b/drivers/input/misc/ad714x-i2c.c
@@ -32,17 +32,12 @@ static int ad714x_i2c_write(struct device *dev, unsigned short reg,
 {
         struct i2c_client *client = to_i2c_client(dev);
         int ret = 0;
-        u8 *_reg = (u8 *)®
-        u8 *_data = (u8 *)&data;
-
-        u8 tx[4] = {
-                _reg[1],
-                _reg[0],
-                _data[1],
-                _data[0]
+        unsigned short tx[2] = {
+                cpu_to_be16(reg),
+                cpu_to_be16(data)
         };
 
-        ret = i2c_master_send(client, tx, 4);
+        ret = i2c_master_send(client, (u8 *)tx, 4);
         if (ret < 0)
                 dev_err(&client->dev, "I2C write error\n");
 
@@ -54,25 +49,16 @@ static int ad714x_i2c_read(struct device *dev, unsigned short reg,
 {
         struct i2c_client *client = to_i2c_client(dev);
         int ret = 0;
-        u8 *_reg = (u8 *)&reg;
-        u8 *_data = (u8 *)data;
+        unsigned short tx = cpu_to_be16(reg);
 
-        u8 tx[2] = {
-                _reg[1],
-                _reg[0]
-        };
-        u8 rx[2];
-
-        ret = i2c_master_send(client, tx, 2);
+        ret = i2c_master_send(client, (u8 *)&tx, 2);
         if (ret >= 0)
-                ret = i2c_master_recv(client, rx, 2);
+                ret = i2c_master_recv(client, (u8 *)data, 2);
 
-        if (unlikely(ret < 0)) {
+        if (unlikely(ret < 0))
                 dev_err(&client->dev, "I2C read error\n");
-        } else {
-                _data[0] = rx[1];
-                _data[1] = rx[0];
-        }
+        else
+                *data = be16_to_cpu(*data);
 
         return ret;
 }
diff --git a/drivers/input/misc/ad714x-spi.c b/drivers/input/misc/ad714x-spi.c
index da83ac9bed7e..0c7f9488f5cb 100644
--- a/drivers/input/misc/ad714x-spi.c
+++ b/drivers/input/misc/ad714x-spi.c
@@ -6,7 +6,7 @@
  * Licensed under the GPL-2 or later.
  */
 
-#include <linux/input.h>        /* BUS_I2C */
+#include <linux/input.h>        /* BUS_SPI */
 #include <linux/module.h>
 #include <linux/spi/spi.h>
 #include <linux/pm.h>
@@ -30,22 +30,28 @@ static int ad714x_spi_resume(struct device *dev)
 
 static SIMPLE_DEV_PM_OPS(ad714x_spi_pm, ad714x_spi_suspend, ad714x_spi_resume);
 
-static int ad714x_spi_read(struct device *dev, unsigned short reg,
-                unsigned short *data)
+static int ad714x_spi_read(struct device *dev,
+                           unsigned short reg, unsigned short *data)
 {
         struct spi_device *spi = to_spi_device(dev);
-        unsigned short tx = AD714x_SPI_CMD_PREFIX | AD714x_SPI_READ | reg;
+        unsigned short tx = cpu_to_be16(AD714x_SPI_CMD_PREFIX |
+                                        AD714x_SPI_READ | reg);
+        int ret;
 
-        return spi_write_then_read(spi, (u8 *)&tx, 2, (u8 *)data, 2);
+        ret = spi_write_then_read(spi, &tx, 2, data, 2);
+
+        *data = be16_to_cpup(data);
+
+        return ret;
 }
 
-static int ad714x_spi_write(struct device *dev, unsigned short reg,
-                unsigned short data)
+static int ad714x_spi_write(struct device *dev,
+                            unsigned short reg, unsigned short data)
 {
         struct spi_device *spi = to_spi_device(dev);
         unsigned short tx[2] = {
-                AD714x_SPI_CMD_PREFIX | reg,
-                data
+                cpu_to_be16(AD714x_SPI_CMD_PREFIX | reg),
+                cpu_to_be16(data)
         };
 
         return spi_write(spi, (u8 *)tx, 4);