Merge tag 'for-linus-20121219' of git://git.infradead.org/linux-mtd

[firefly-linux-kernel-4.4.55.git] / drivers / input / keyboard / qt2160.c

diff --git a/drivers/input/keyboard/qt2160.c b/drivers/input/keyboard/qt2160.c
index 76b7d430d03a4a26f18666469413be1449f8fc20..3dc2b0f27b0c48386cb13bd367df67d5b9cbe214 100644 (file)
--- a/drivers/input/keyboard/qt2160.c
+++ b/drivers/input/keyboard/qt2160.c
@@ -183,7 +183,7 @@ static void qt2160_worker(struct work_struct *work)
        qt2160_schedule_read(qt2160);
 }
 
-static int __devinit qt2160_read(struct i2c_client *client, u8 reg)
+static int qt2160_read(struct i2c_client *client, u8 reg)
 {
        int ret;
 
@@ -204,29 +204,20 @@ static int __devinit qt2160_read(struct i2c_client *client, u8 reg)
        return ret;
 }
 
-static int __devinit qt2160_write(struct i2c_client *client, u8 reg, u8 data)
+static int qt2160_write(struct i2c_client *client, u8 reg, u8 data)
 {
-       int error;
-
-       error = i2c_smbus_write_byte(client, reg);
-       if (error) {
-               dev_err(&client->dev,
-                       "couldn't send request. Returned %d\n", error);
-               return error;
-       }
+       int ret;
 
-       error = i2c_smbus_write_byte(client, data);
-       if (error) {
+       ret = i2c_smbus_write_byte_data(client, reg, data);
+       if (ret < 0)
                dev_err(&client->dev,
-                       "couldn't write data. Returned %d\n", error);
-               return error;
-       }
+                       "couldn't write data. Returned %d\n", ret);
 
-       return error;
+       return ret;
 }
 
 
-static bool __devinit qt2160_identify(struct i2c_client *client)
+static bool qt2160_identify(struct i2c_client *client)
 {
        int id, ver, rev;
 
@@ -257,7 +248,7 @@ static bool __devinit qt2160_identify(struct i2c_client *client)
        return true;
 }
 
-static int __devinit qt2160_probe(struct i2c_client *client,
+static int qt2160_probe(struct i2c_client *client,
                                  const struct i2c_device_id *id)
 {
        struct qt2160_data *qt2160;
@@ -344,7 +335,7 @@ err_free_mem:
        return error;
 }
 
-static int __devexit qt2160_remove(struct i2c_client *client)
+static int qt2160_remove(struct i2c_client *client)
 {
        struct qt2160_data *qt2160 = i2c_get_clientdata(client);
 
@@ -375,7 +366,7 @@ static struct i2c_driver qt2160_driver = {
 
        .id_table       = qt2160_idtable,
        .probe          = qt2160_probe,
-       .remove         = __devexit_p(qt2160_remove),
+       .remove         = qt2160_remove,
 };
 
 module_i2c_driver(qt2160_driver);