Merge tag 'pm-merge' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[~andy/linux] / drivers / staging / iio / light / isl29028.c

diff --git a/drivers/staging/iio/light/isl29028.c b/drivers/staging/iio/light/isl29028.c
index 33a4c3f94a144b66c41e0ca127222d8510c339f8..e52af77f7782c222a417466a4830569f43e6fe90 100644 (file)
--- a/drivers/staging/iio/light/isl29028.c
+++ b/drivers/staging/iio/light/isl29028.c
@@ -475,7 +475,7 @@ static const struct regmap_config isl29028_regmap_config = {
        .cache_type = REGCACHE_RBTREE,
 };
 
-static int __devinit isl29028_probe(struct i2c_client *client,
+static int isl29028_probe(struct i2c_client *client,
        const struct i2c_device_id *id)
 {
        struct isl29028_chip *chip;
@@ -526,7 +526,7 @@ exit_iio_free:
        return ret;
 }
 
-static int __devexit isl29028_remove(struct i2c_client *client)
+static int isl29028_remove(struct i2c_client *client)
 {
        struct iio_dev *indio_dev = i2c_get_clientdata(client);
 
@@ -555,7 +555,7 @@ static struct i2c_driver isl29028_driver = {
                .of_match_table = isl29028_of_match,
        },
        .probe   = isl29028_probe,
-       .remove  = __devexit_p(isl29028_remove),
+       .remove  = isl29028_remove,
        .id_table = isl29028_id,
 };