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

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

diff --git a/drivers/staging/iio/kfifo_buf.c b/drivers/staging/iio/kfifo_buf.c
index cc14b96..6002368 100644 (file)
--- a/drivers/staging/iio/kfifo_buf.c
+++ b/drivers/staging/iio/kfifo_buf.c
@@ -110,9 +110,7 @@ struct iio_ring_buffer *iio_kfifo_allocate(struct iio_dev *indio_dev)
        iio_ring_buffer_init(&kf->ring, indio_dev);
        __iio_init_kfifo(kf);
        kf->ring.dev.type = &iio_kfifo_type;
-       device_initialize(&kf->ring.dev);
        kf->ring.dev.parent = &indio_dev->dev;
-       kf->ring.dev.bus = &iio_bus_type;
        dev_set_drvdata(&kf->ring.dev, (void *)&(kf->ring));
 
        return &kf->ring;