Merge branch 'for-linus' of git://git.kernel.dk/linux-block

[pandora-kernel.git] / drivers / staging / iio / dds / ad9852.c

diff --git a/drivers/staging/iio/dds/ad9852.c b/drivers/staging/iio/dds/ad9852.c
index 08020f9..0184585 100644 (file)
--- a/drivers/staging/iio/dds/ad9852.c
+++ b/drivers/staging/iio/dds/ad9852.c
@@ -58,7 +58,6 @@ struct ad9852_config {
 
 struct ad9852_state {
        struct mutex lock;
-       struct iio_dev *idev;
        struct spi_device *sdev;
 };
 
@@ -72,7 +71,7 @@ static ssize_t ad9852_set_parameter(struct device *dev,
        int ret;
        struct ad9852_config *config = (struct ad9852_config *)buf;
        struct iio_dev *idev = dev_get_drvdata(dev);
-       struct ad9852_state *st = idev->dev_data;
+       struct ad9852_state *st = iio_priv(idev);
 
        xfer.len = 3;
        xfer.tx_buf = &config->phajst0[0];
@@ -230,30 +229,24 @@ static const struct iio_info ad9852_info = {
 static int __devinit ad9852_probe(struct spi_device *spi)
 {
        struct ad9852_state *st;
+       struct iio_dev *idev;
        int ret = 0;
 
-       st = kzalloc(sizeof(*st), GFP_KERNEL);
-       if (st == NULL) {
+       idev = iio_allocate_device(sizeof(*st));
+       if (idev == NULL) {
                ret = -ENOMEM;
                goto error_ret;
        }
-       spi_set_drvdata(spi, st);
-
+       st = iio_priv(idev);
+       spi_set_drvdata(spi, idev);
        mutex_init(&st->lock);
        st->sdev = spi;
 
-       st->idev = iio_allocate_device(0);
-       if (st->idev == NULL) {
-               ret = -ENOMEM;
-               goto error_free_st;
-       }
-       st->idev->dev.parent = &spi->dev;
+       idev->dev.parent = &spi->dev;
+       idev->info = &ad9852_info;
+       idev->modes = INDIO_DIRECT_MODE;
 
-       st->idev->info = &ad9852_info;
-       st->idev->dev_data = (void *)(st);
-       st->idev->modes = INDIO_DIRECT_MODE;
-
-       ret = iio_device_register(st->idev);
+       ret = iio_device_register(idev);
        if (ret)
                goto error_free_dev;
        spi->max_speed_hz = 2000000;
@@ -261,22 +254,19 @@ static int __devinit ad9852_probe(struct spi_device *spi)
        spi->bits_per_word = 8;
        spi_setup(spi);
        ad9852_init(st);
+
        return 0;
 
 error_free_dev:
-       iio_free_device(st->idev);
-error_free_st:
-       kfree(st);
+       iio_free_device(idev);
+
 error_ret:
        return ret;
 }
 
 static int __devexit ad9852_remove(struct spi_device *spi)
 {
-       struct ad9852_state *st = spi_get_drvdata(spi);
-
-       iio_device_unregister(st->idev);
-       kfree(st);
+       iio_device_unregister(spi_get_drvdata(spi));
 
        return 0;
 }