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

[karo-tx-linux.git] / drivers / staging / iio / resolver / ad2s90.c

diff --git a/drivers/staging/iio/resolver/ad2s90.c b/drivers/staging/iio/resolver/ad2s90.c
index cfeedfb7c774e1177a546c370a2ff1747e9dd2cf..5b1c0db33e7f2dfe4ddbebdc48c117b01f146e5b 100644 (file)
--- a/drivers/staging/iio/resolver/ad2s90.c
+++ b/drivers/staging/iio/resolver/ad2s90.c
@@ -79,7 +79,7 @@ static int ad2s90_probe(struct spi_device *spi)
        indio_dev->num_channels = 1;
        indio_dev->name = spi_get_device_id(spi)->name;
 
-       ret = iio_device_register(indio_dev);
+       ret = devm_iio_device_register(indio_dev->dev.parent, indio_dev);
        if (ret)
                return ret;
 
@@ -91,13 +91,6 @@ static int ad2s90_probe(struct spi_device *spi)
        return 0;
 }
 
-static int ad2s90_remove(struct spi_device *spi)
-{
-       iio_device_unregister(spi_get_drvdata(spi));
-
-       return 0;
-}
-
 static const struct spi_device_id ad2s90_id[] = {
        { "ad2s90" },
        {}
@@ -109,7 +102,6 @@ static struct spi_driver ad2s90_driver = {
                .name = "ad2s90",
        },
        .probe = ad2s90_probe,
-       .remove = ad2s90_remove,
        .id_table = ad2s90_id,
 };
 module_spi_driver(ad2s90_driver);