Bluetooth: Simplify UUID removal code

[karo-tx-linux.git] / drivers / input / mouse / synaptics_i2c.c

diff --git a/drivers/input/mouse/synaptics_i2c.c b/drivers/input/mouse/synaptics_i2c.c
index 063a174d3a88c4a22acb67a7e474b330e355b336..ad822608f6ee92f5ffb3b98ac08425d2cd3d845d 100644 (file)
--- a/drivers/input/mouse/synaptics_i2c.c
+++ b/drivers/input/mouse/synaptics_i2c.c
@@ -535,7 +535,7 @@ static struct synaptics_i2c *synaptics_i2c_touch_create(struct i2c_client *clien
        return touch;
 }
 
-static int __devinit synaptics_i2c_probe(struct i2c_client *client,
+static int synaptics_i2c_probe(struct i2c_client *client,
                               const struct i2c_device_id *dev_id)
 {
        int ret;
@@ -601,7 +601,7 @@ err_mem_free:
        return ret;
 }
 
-static int __devexit synaptics_i2c_remove(struct i2c_client *client)
+static int synaptics_i2c_remove(struct i2c_client *client)
 {
        struct synaptics_i2c *touch = i2c_get_clientdata(client);
 
@@ -662,7 +662,7 @@ static struct i2c_driver synaptics_i2c_driver = {
        },
 
        .probe          = synaptics_i2c_probe,
-       .remove         = __devexit_p(synaptics_i2c_remove),
+       .remove         = synaptics_i2c_remove,
 
        .id_table       = synaptics_i2c_id_table,
 };