Merge remote-tracking branch 'staging/staging-next'

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

diff --git a/drivers/staging/iio/light/isl29028.c b/drivers/staging/iio/light/isl29028.c
index cd6f2727aa58739b329acc46ee49a3321f8daa39..32ae1127da33af4255075ac567a79bc99d108ce5 100644 (file)
--- a/drivers/staging/iio/light/isl29028.c
+++ b/drivers/staging/iio/light/isl29028.c
@@ -513,7 +513,7 @@ static int isl29028_probe(struct i2c_client *client,
        indio_dev->name = id->name;
        indio_dev->dev.parent = &client->dev;
        indio_dev->modes = INDIO_DIRECT_MODE;
-       ret = iio_device_register(indio_dev);
+       ret = devm_iio_device_register(indio_dev->dev.parent, indio_dev);
        if (ret < 0) {
                dev_err(chip->dev, "iio registration fails with error %d\n",
                        ret);
@@ -522,14 +522,6 @@ static int isl29028_probe(struct i2c_client *client,
        return 0;
 }
 
-static int isl29028_remove(struct i2c_client *client)
-{
-       struct iio_dev *indio_dev = i2c_get_clientdata(client);
-
-       iio_device_unregister(indio_dev);
-       return 0;
-}
-
 static const struct i2c_device_id isl29028_id[] = {
        {"isl29028", 0},
        {}
@@ -550,7 +542,6 @@ static struct i2c_driver isl29028_driver = {
                .of_match_table = isl29028_of_match,
        },
        .probe   = isl29028_probe,
-       .remove  = isl29028_remove,
        .id_table = isl29028_id,
 };