Merge tag 'please-pull-einj-fix-for-acpi5' of git://git.kernel.org/pub/scm/linux...

[karo-tx-linux.git] / drivers / staging / iio / light / tsl2583.c

diff --git a/drivers/staging/iio/light/tsl2583.c b/drivers/staging/iio/light/tsl2583.c
index 6d2f4c659e565825e629b9399f40769facb93f88..b377dd3b76ad3a2eea33e34025923859bb1b477b 100644 (file)
--- a/drivers/staging/iio/light/tsl2583.c
+++ b/drivers/staging/iio/light/tsl2583.c
@@ -799,7 +799,7 @@ static const struct iio_info tsl2583_info = {
  * Client probe function - When a valid device is found, the driver's device
  * data structure is updated, and initialization completes successfully.
  */
-static int __devinit taos_probe(struct i2c_client *clientp,
+static int taos_probe(struct i2c_client *clientp,
                      const struct i2c_device_id *idp)
 {
        int i, ret;
@@ -923,7 +923,7 @@ static SIMPLE_DEV_PM_OPS(taos_pm_ops, taos_suspend, taos_resume);
 #define TAOS_PM_OPS NULL
 #endif
 
-static int __devexit taos_remove(struct i2c_client *client)
+static int taos_remove(struct i2c_client *client)
 {
        iio_device_unregister(i2c_get_clientdata(client));
        iio_device_free(i2c_get_clientdata(client));
@@ -947,7 +947,7 @@ static struct i2c_driver taos_driver = {
        },
        .id_table = taos_idtable,
        .probe = taos_probe,
-       .remove = __devexit_p(taos_remove),
+       .remove = taos_remove,
 };
 module_i2c_driver(taos_driver);