staging: iio: push the main buffer chrdev down to the top level.

Sorry all, this one is very invasive, though the driver changes are
just trivial interface fixes. Not all done yet.

V2 - bring the sca3000 with us.
V3 - fix ade7758 bugs in conversion.
V4 - add ad5933

Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
Acked-by: Michael Hennerich <michael.hennerich@analog.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/iio/Documentation/generic_buffer.c b/drivers/staging/iio/Documentation/generic_buffer.c
index f82894f42d27f96c196fc8d964d8fa7634360b96..d58095321491449986c0a3dd51aedf58223a3aa3 100644 (file)
--- a/drivers/staging/iio/Documentation/generic_buffer.c
+++ b/drivers/staging/iio/Documentation/generic_buffer.c
@@ -173,7 +173,7 @@ int main(int argc, char **argv)
                return -1;
 
        /* Find the device requested */
-       dev_num = find_type_by_name(device_name, "device");
+       dev_num = find_type_by_name(device_name, "iio:device");
        if (dev_num < 0) {
                printf("Failed to find the %s\n", device_name);
                ret = -ENODEV;
@@ -181,7 +181,7 @@ int main(int argc, char **argv)
        }
        printf("iio device number being used is %d\n", dev_num);
 
-       asprintf(&dev_dir_name, "%sdevice%d", iio_dir, dev_num);
+       asprintf(&dev_dir_name, "%siio:device%d", iio_dir, dev_num);
        if (trigger_name == NULL) {
                /*
                 * Build the trigger name. If it is device associated it's
@@ -212,6 +212,7 @@ int main(int argc, char **argv)
        ret = build_channel_array(dev_dir_name, &infoarray, &num_channels);
        if (ret) {
                printf("Problem reading scan element information\n");
+               printf("diag %s\n", dev_dir_name);
                goto error_free_triggername;
        }
 
@@ -220,7 +221,8 @@ int main(int argc, char **argv)
         * As we know that the lis3l02dq has only one buffer this may
         * be built rather than found.
         */
-       ret = asprintf(&buf_dir_name, "%sdevice%d:buffer0", iio_dir, dev_num);
+       ret = asprintf(&buf_dir_name,
+                      "%siio:device%d/buffer", iio_dir, dev_num);
        if (ret < 0) {
                ret = -ENOMEM;
                goto error_free_triggername;
@@ -251,9 +253,7 @@ int main(int argc, char **argv)
                goto error_free_buf_dir_name;
        }
 
-       ret = asprintf(&buffer_access,
-                      "/dev/device%d:buffer0",
-                      dev_num);
+       ret = asprintf(&buffer_access, "/dev/iio:device%d", dev_num);
        if (ret < 0) {
                ret = -ENOMEM;
                goto error_free_data;

diff --git a/drivers/staging/iio/Documentation/iio_utils.h b/drivers/staging/iio/Documentation/iio_utils.h
index 150f44073631314b49628ca9cc21532bee70d8ee..75938b2412ffc53ee4d78e3f23126900ce6e38bd 100644 (file)
--- a/drivers/staging/iio/Documentation/iio_utils.h
+++ b/drivers/staging/iio/Documentation/iio_utils.h
@@ -16,7 +16,7 @@
 
 #define IIO_MAX_NAME_LENGTH 30
 
-#define FORMAT_SCAN_ELEMENTS_DIR "%s:buffer0/scan_elements"
+#define FORMAT_SCAN_ELEMENTS_DIR "%s/scan_elements"
 #define FORMAT_TYPE_FILE "%s_type"
 
 const char *iio_dir = "/sys/bus/iio/devices/";

diff --git a/drivers/staging/iio/accel/adis16201_core.c b/drivers/staging/iio/accel/adis16201_core.c
index 2b8c5e9c33e543e4794a73ee2706c4ab4708d684..d16c45959fd3da4ea279ca2ce46a6f381d787311 100644 (file)
--- a/drivers/staging/iio/accel/adis16201_core.c
+++ b/drivers/staging/iio/accel/adis16201_core.c
@@ -497,7 +497,7 @@ static int __devinit adis16201_probe(struct spi_device *spi)
                goto error_unreg_ring_funcs;
        regdone = 1;
 
-       ret = iio_ring_buffer_register_ex(indio_dev->ring, 0,
+       ret = iio_ring_buffer_register_ex(indio_dev, 0,
                                          adis16201_channels,
                                          ARRAY_SIZE(adis16201_channels));
        if (ret) {
@@ -520,7 +520,7 @@ static int __devinit adis16201_probe(struct spi_device *spi)
 error_remove_trigger:
        adis16201_remove_trigger(indio_dev);
 error_uninitialize_ring:
-       iio_ring_buffer_unregister(indio_dev->ring);
+       iio_ring_buffer_unregister(indio_dev);
 error_unreg_ring_funcs:
        adis16201_unconfigure_ring(indio_dev);
 error_free_dev:
@@ -537,7 +537,7 @@ static int adis16201_remove(struct spi_device *spi)
        struct iio_dev *indio_dev = spi_get_drvdata(spi);
 
        adis16201_remove_trigger(indio_dev);
-       iio_ring_buffer_unregister(indio_dev->ring);
+       iio_ring_buffer_unregister(indio_dev);
        iio_device_unregister(indio_dev);
        adis16201_unconfigure_ring(indio_dev);
 

diff --git a/drivers/staging/iio/accel/adis16203_core.c b/drivers/staging/iio/accel/adis16203_core.c
index 14836762736960b7207be90216429a424266c2ca..cc3869bbf465c8720b1a487c1ba9c40f52c7fb97 100644 (file)
--- a/drivers/staging/iio/accel/adis16203_core.c
+++ b/drivers/staging/iio/accel/adis16203_core.c
@@ -451,7 +451,7 @@ static int __devinit adis16203_probe(struct spi_device *spi)
                goto error_unreg_ring_funcs;
        regdone = 1;
 
-       ret = iio_ring_buffer_register_ex(indio_dev->ring, 0,
+       ret = iio_ring_buffer_register_ex(indio_dev, 0,
                                          adis16203_channels,
                                          ARRAY_SIZE(adis16203_channels));
        if (ret) {
@@ -474,7 +474,7 @@ static int __devinit adis16203_probe(struct spi_device *spi)
 error_remove_trigger:
        adis16203_remove_trigger(indio_dev);
 error_uninitialize_ring:
-       iio_ring_buffer_unregister(indio_dev->ring);
+       iio_ring_buffer_unregister(indio_dev);
 error_unreg_ring_funcs:
        adis16203_unconfigure_ring(indio_dev);
 error_free_dev:
@@ -491,7 +491,7 @@ static int adis16203_remove(struct spi_device *spi)
        struct iio_dev *indio_dev = spi_get_drvdata(spi);
 
        adis16203_remove_trigger(indio_dev);
-       iio_ring_buffer_unregister(indio_dev->ring);
+       iio_ring_buffer_unregister(indio_dev);
        iio_device_unregister(indio_dev);
        adis16203_unconfigure_ring(indio_dev);
 

diff --git a/drivers/staging/iio/accel/adis16204_core.c b/drivers/staging/iio/accel/adis16204_core.c
index 445a75b1d54073a58749d83d1a645a419800a15a..3cc229d9564548b6093a19b00f3f61c73bfc2c54 100644 (file)
--- a/drivers/staging/iio/accel/adis16204_core.c
+++ b/drivers/staging/iio/accel/adis16204_core.c
@@ -526,7 +526,7 @@ static int __devinit adis16204_probe(struct spi_device *spi)
                goto error_unreg_ring_funcs;
        regdone = 1;
 
-       ret = iio_ring_buffer_register_ex(indio_dev->ring, 0,
+       ret = iio_ring_buffer_register_ex(indio_dev, 0,
                                          adis16204_channels,
                                          ARRAY_SIZE(adis16204_channels));
        if (ret) {
@@ -549,7 +549,7 @@ static int __devinit adis16204_probe(struct spi_device *spi)
 error_remove_trigger:
        adis16204_remove_trigger(indio_dev);
 error_uninitialize_ring:
-       iio_ring_buffer_unregister(indio_dev->ring);
+       iio_ring_buffer_unregister(indio_dev);
 error_unreg_ring_funcs:
        adis16204_unconfigure_ring(indio_dev);
 error_free_dev:
@@ -566,7 +566,7 @@ static int adis16204_remove(struct spi_device *spi)
        struct iio_dev *indio_dev = spi_get_drvdata(spi);
 
        adis16204_remove_trigger(indio_dev);
-       iio_ring_buffer_unregister(indio_dev->ring);
+       iio_ring_buffer_unregister(indio_dev);
        iio_device_unregister(indio_dev);
        adis16204_unconfigure_ring(indio_dev);
 

diff --git a/drivers/staging/iio/accel/adis16209_core.c b/drivers/staging/iio/accel/adis16209_core.c
index ca671ddc152d08178f9e48e098d97dcec041c1b4..fa4c6c055db8eabd0bfb49385c820b38b95cd500 100644 (file)
--- a/drivers/staging/iio/accel/adis16209_core.c
+++ b/drivers/staging/iio/accel/adis16209_core.c
@@ -499,7 +499,7 @@ static int __devinit adis16209_probe(struct spi_device *spi)
                goto error_unreg_ring_funcs;
        regdone = 1;
 
-       ret = iio_ring_buffer_register_ex(indio_dev->ring, 0,
+       ret = iio_ring_buffer_register_ex(indio_dev, 0,
                                          adis16209_channels,
                                          ARRAY_SIZE(adis16209_channels));
        if (ret) {
@@ -522,7 +522,7 @@ static int __devinit adis16209_probe(struct spi_device *spi)
 error_remove_trigger:
        adis16209_remove_trigger(indio_dev);
 error_uninitialize_ring:
-       iio_ring_buffer_unregister(indio_dev->ring);
+       iio_ring_buffer_unregister(indio_dev);
 error_unreg_ring_funcs:
        adis16209_unconfigure_ring(indio_dev);
 error_free_dev:
@@ -541,7 +541,7 @@ static int adis16209_remove(struct spi_device *spi)
        flush_scheduled_work();
 
        adis16209_remove_trigger(indio_dev);
-       iio_ring_buffer_unregister(indio_dev->ring);
+       iio_ring_buffer_unregister(indio_dev);
        iio_device_unregister(indio_dev);
        adis16209_unconfigure_ring(indio_dev);
 

diff --git a/drivers/staging/iio/accel/adis16240_core.c b/drivers/staging/iio/accel/adis16240_core.c
index d485f7342f8d55fa20cadd7ff67b55253df22ba7..2c6ced0366d351ae8371d667807e25a74600e129 100644 (file)
--- a/drivers/staging/iio/accel/adis16240_core.c
+++ b/drivers/staging/iio/accel/adis16240_core.c
@@ -552,7 +552,7 @@ static int __devinit adis16240_probe(struct spi_device *spi)
                goto error_unreg_ring_funcs;
        regdone = 1;
 
-       ret = iio_ring_buffer_register_ex(indio_dev->ring, 0,
+       ret = iio_ring_buffer_register_ex(indio_dev, 0,
                                          adis16240_channels,
                                          ARRAY_SIZE(adis16240_channels));
        if (ret) {
@@ -575,7 +575,7 @@ static int __devinit adis16240_probe(struct spi_device *spi)
 error_remove_trigger:
        adis16240_remove_trigger(indio_dev);
 error_uninitialize_ring:
-       iio_ring_buffer_unregister(indio_dev->ring);
+       iio_ring_buffer_unregister(indio_dev);
 error_unreg_ring_funcs:
        adis16240_unconfigure_ring(indio_dev);
 error_free_dev:
@@ -595,7 +595,7 @@ static int adis16240_remove(struct spi_device *spi)
        flush_scheduled_work();
 
        adis16240_remove_trigger(indio_dev);
-       iio_ring_buffer_unregister(indio_dev->ring);
+       iio_ring_buffer_unregister(indio_dev);
        iio_device_unregister(indio_dev);
        adis16240_unconfigure_ring(indio_dev);
 

diff --git a/drivers/staging/iio/accel/lis3l02dq_core.c b/drivers/staging/iio/accel/lis3l02dq_core.c
index 33001f8992eb4bf63c37b541e2df4bbbf51fcc52..440b26bff349a1b13ee7107c2ad71dc732496225 100644 (file)
--- a/drivers/staging/iio/accel/lis3l02dq_core.c
+++ b/drivers/staging/iio/accel/lis3l02dq_core.c
@@ -696,7 +696,7 @@ static int __devinit lis3l02dq_probe(struct spi_device *spi)
                goto error_unreg_ring_funcs;
        regdone = 1;
 
-       ret = iio_ring_buffer_register_ex(indio_dev->ring, 0,
+       ret = iio_ring_buffer_register_ex(indio_dev, 0,
                                          lis3l02dq_channels,
                                          ARRAY_SIZE(lis3l02dq_channels));
        if (ret) {
@@ -732,7 +732,7 @@ error_free_interrupt:
        if (spi->irq && gpio_is_valid(irq_to_gpio(spi->irq)) > 0)
                free_irq(st->us->irq, indio_dev);
 error_uninitialize_ring:
-       iio_ring_buffer_unregister(indio_dev->ring);
+       iio_ring_buffer_unregister(indio_dev);
 error_unreg_ring_funcs:
        lis3l02dq_unconfigure_ring(indio_dev);
 error_free_dev:
@@ -789,7 +789,7 @@ static int lis3l02dq_remove(struct spi_device *spi)
                free_irq(st->us->irq, indio_dev);
 
        lis3l02dq_remove_trigger(indio_dev);
-       iio_ring_buffer_unregister(indio_dev->ring);
+       iio_ring_buffer_unregister(indio_dev);
        lis3l02dq_unconfigure_ring(indio_dev);
        iio_device_unregister(indio_dev);
 

diff --git a/drivers/staging/iio/accel/sca3000_core.c b/drivers/staging/iio/accel/sca3000_core.c
index d7f79b40353b3d2a740b9f26461e593cf6b13ee7..1a6780f9c5a50943106b4115fe7d2bbaa0c75119 100644 (file)
--- a/drivers/staging/iio/accel/sca3000_core.c
+++ b/drivers/staging/iio/accel/sca3000_core.c
@@ -1157,7 +1157,7 @@ static int __devinit sca3000_probe(struct spi_device *spi)
        if (ret < 0)
                goto error_free_dev;
        regdone = 1;
-       ret = iio_ring_buffer_register_ex(indio_dev->ring, 0,
+       ret = iio_ring_buffer_register_ex(indio_dev, 0,
                                          sca3000_channels,
                                          ARRAY_SIZE(sca3000_channels));
        if (ret < 0)
@@ -1182,7 +1182,7 @@ error_free_irq:
        if (spi->irq && gpio_is_valid(irq_to_gpio(spi->irq)) > 0)
                free_irq(spi->irq, indio_dev);
 error_unregister_ring:
-       iio_ring_buffer_unregister(indio_dev->ring);
+       iio_ring_buffer_unregister(indio_dev);
 error_unregister_dev:
 error_free_dev:
        if (regdone)
@@ -1223,7 +1223,7 @@ static int sca3000_remove(struct spi_device *spi)
                return ret;
        if (spi->irq && gpio_is_valid(irq_to_gpio(spi->irq)) > 0)
                free_irq(spi->irq, indio_dev);
-       iio_ring_buffer_unregister(indio_dev->ring);
+       iio_ring_buffer_unregister(indio_dev);
        sca3000_unconfigure_ring(indio_dev);
        iio_device_unregister(indio_dev);
 

diff --git a/drivers/staging/iio/accel/sca3000_ring.c b/drivers/staging/iio/accel/sca3000_ring.c
index 0b736dbe818cd2d9d684948e2e3d8d8a59ccf6ad..cc38521e6e2138c3566b4c214d524900f0e5b8d1 100644 (file)
--- a/drivers/staging/iio/accel/sca3000_ring.c
+++ b/drivers/staging/iio/accel/sca3000_ring.c
@@ -144,11 +144,6 @@ static int sca3000_ring_get_bytes_per_datum(struct iio_ring_buffer *r)
 {
        return 6;
 }
-static void sca3000_ring_release(struct device *dev)
-{
-       struct iio_ring_buffer *r = to_iio_ring_buffer(dev);
-       kfree(iio_to_hw_ring_buf(r));
-}
 
 static IIO_RING_ENABLE_ATTR;
 static IIO_RING_BYTES_PER_DATUM_ATTR;
@@ -258,16 +253,7 @@ static struct attribute *sca3000_ring_attributes[] = {
 
 static struct attribute_group sca3000_ring_attr = {
        .attrs = sca3000_ring_attributes,
-};
-
-static const struct attribute_group *sca3000_ring_attr_groups[] = {
-       &sca3000_ring_attr,
-       NULL
-};
-
-static struct device_type sca3000_ring_type = {
-       .release = sca3000_ring_release,
-       .groups = sca3000_ring_attr_groups,
+       .name = "buffer",
 };
 
 static struct iio_ring_buffer *sca3000_rb_allocate(struct iio_dev *indio_dev)
@@ -282,18 +268,15 @@ static struct iio_ring_buffer *sca3000_rb_allocate(struct iio_dev *indio_dev)
        ring->private = indio_dev;
        buf = &ring->buf;
        buf->stufftoread = 0;
+       buf->attrs = &sca3000_ring_attr;
        iio_ring_buffer_init(buf, indio_dev);
-       buf->dev.type = &sca3000_ring_type;
-       buf->dev.parent = &indio_dev->dev;
-       dev_set_drvdata(&buf->dev, (void *)buf);
 
        return buf;
 }
 
 static inline void sca3000_rb_free(struct iio_ring_buffer *r)
 {
-       if (r)
-               iio_put_ring_buffer(r);
+       kfree(iio_to_hw_ring_buf(r));
 }
 
 static const struct iio_ring_access_funcs sca3000_ring_access_funcs = {

diff --git a/drivers/staging/iio/adc/ad7192.c b/drivers/staging/iio/adc/ad7192.c
index adf6d95dd34fca099880363605e699c929e7f8f6..6e1656e44e372c0cb8ac2c776d3f60c88176116c 100644 (file)
--- a/drivers/staging/iio/adc/ad7192.c
+++ b/drivers/staging/iio/adc/ad7192.c
@@ -1098,7 +1098,7 @@ static int __devinit ad7192_probe(struct spi_device *spi)
        if (ret)
                goto error_unreg_ring;
 
-       ret = iio_ring_buffer_register_ex(indio_dev->ring, 0,
+       ret = iio_ring_buffer_register_ex(indio_dev, 0,
                                          indio_dev->channels,
                                          indio_dev->num_channels);
        if (ret)
@@ -1111,7 +1111,7 @@ static int __devinit ad7192_probe(struct spi_device *spi)
        return 0;
 
 error_uninitialize_ring:
-       iio_ring_buffer_unregister(indio_dev->ring);
+       iio_ring_buffer_unregister(indio_dev);
 error_remove_trigger:
        ad7192_remove_trigger(indio_dev);
 error_unreg_ring:
@@ -1136,7 +1136,7 @@ static int ad7192_remove(struct spi_device *spi)
        struct iio_dev *indio_dev = spi_get_drvdata(spi);
        struct ad7192_state *st = iio_priv(indio_dev);
 
-       iio_ring_buffer_unregister(indio_dev->ring);
+       iio_ring_buffer_unregister(indio_dev);
        ad7192_remove_trigger(indio_dev);
        ad7192_ring_cleanup(indio_dev);
 

diff --git a/drivers/staging/iio/adc/ad7298_core.c b/drivers/staging/iio/adc/ad7298_core.c
index 3e5bead26367e5c49914fc7197cadd5e7315378c..9c50b022d1013637929dd05e0314bc2fc3149351 100644 (file)
--- a/drivers/staging/iio/adc/ad7298_core.c
+++ b/drivers/staging/iio/adc/ad7298_core.c
@@ -223,7 +223,7 @@ static int __devinit ad7298_probe(struct spi_device *spi)
                goto error_disable_reg;
        regdone = 1;
 
-       ret = iio_ring_buffer_register_ex(indio_dev->ring, 0,
+       ret = iio_ring_buffer_register_ex(indio_dev, 0,
                                          &ad7298_channels[1], /* skip temp0 */
                                          ARRAY_SIZE(ad7298_channels) - 1);
        if (ret)
@@ -253,7 +253,7 @@ static int __devexit ad7298_remove(struct spi_device *spi)
        struct iio_dev *indio_dev = spi_get_drvdata(spi);
        struct ad7298_state *st = iio_priv(indio_dev);
 
-       iio_ring_buffer_unregister(indio_dev->ring);
+       iio_ring_buffer_unregister(indio_dev);
        ad7298_ring_cleanup(indio_dev);
        iio_device_unregister(indio_dev);
        if (!IS_ERR(st->reg)) {

diff --git a/drivers/staging/iio/adc/ad7476_core.c b/drivers/staging/iio/adc/ad7476_core.c
index bb8be5daa6b810dfd94fbe4b826f5c224b70e3f3..bea9e82057fc961bc27263734e41da5075b48700 100644 (file)
--- a/drivers/staging/iio/adc/ad7476_core.c
+++ b/drivers/staging/iio/adc/ad7476_core.c
@@ -186,7 +186,7 @@ static int __devinit ad7476_probe(struct spi_device *spi)
        if (ret)
                goto error_disable_reg;
 
-       ret = iio_ring_buffer_register_ex(indio_dev->ring, 0,
+       ret = iio_ring_buffer_register_ex(indio_dev, 0,
                                          st->chip_info->channel,
                                          ARRAY_SIZE(st->chip_info->channel));
        if (ret)
@@ -215,7 +215,7 @@ static int ad7476_remove(struct spi_device *spi)
        /* copy needed as st will have been freed */
        struct regulator *reg = st->reg;
 
-       iio_ring_buffer_unregister(indio_dev->ring);
+       iio_ring_buffer_unregister(indio_dev);
        ad7476_ring_cleanup(indio_dev);
        iio_device_unregister(indio_dev);
        if (!IS_ERR(reg)) {

diff --git a/drivers/staging/iio/adc/ad7606_core.c b/drivers/staging/iio/adc/ad7606_core.c
index ef0558130ca7be658d12e18ab212f5e6167a6846..7aef4d5188fa8c37a41350de4a4fc1a02b0e0365 100644 (file)
--- a/drivers/staging/iio/adc/ad7606_core.c
+++ b/drivers/staging/iio/adc/ad7606_core.c
@@ -506,7 +506,7 @@ struct iio_dev *ad7606_probe(struct device *dev, int irq,
                goto error_free_irq;
        regdone = 1;
 
-       ret = iio_ring_buffer_register_ex(indio_dev->ring, 0,
+       ret = iio_ring_buffer_register_ex(indio_dev, 0,
                                          indio_dev->channels,
                                          indio_dev->num_channels);
        if (ret)
@@ -541,7 +541,7 @@ int ad7606_remove(struct iio_dev *indio_dev)
 {
        struct ad7606_state *st = iio_priv(indio_dev);
 
-       iio_ring_buffer_unregister(indio_dev->ring);
+       iio_ring_buffer_unregister(indio_dev);
        ad7606_ring_cleanup(indio_dev);
 
        free_irq(st->irq, indio_dev);

diff --git a/drivers/staging/iio/adc/ad7793.c b/drivers/staging/iio/adc/ad7793.c
index 1bcb3ebb1bc6765119052081aab9fbbf69e1447d..ed993e3490841e0e24f20f8f425beafa7dac8a3a 100644 (file)
--- a/drivers/staging/iio/adc/ad7793.c
+++ b/drivers/staging/iio/adc/ad7793.c
@@ -895,7 +895,7 @@ static int __devinit ad7793_probe(struct spi_device *spi)
        if (ret)
                goto error_unreg_ring;
 
-       ret = iio_ring_buffer_register_ex(indio_dev->ring, 0,
+       ret = iio_ring_buffer_register_ex(indio_dev, 0,
                                          indio_dev->channels,
                                          indio_dev->num_channels);
        if (ret)
@@ -908,7 +908,7 @@ static int __devinit ad7793_probe(struct spi_device *spi)
        return 0;
 
 error_uninitialize_ring:
-       iio_ring_buffer_unregister(indio_dev->ring);
+       iio_ring_buffer_unregister(indio_dev);
 error_remove_trigger:
        ad7793_remove_trigger(indio_dev);
 error_unreg_ring:
@@ -933,7 +933,7 @@ static int ad7793_remove(struct spi_device *spi)
        struct iio_dev *indio_dev = spi_get_drvdata(spi);
        struct ad7793_state *st = iio_priv(indio_dev);
 
-       iio_ring_buffer_unregister(indio_dev->ring);
+       iio_ring_buffer_unregister(indio_dev);
        ad7793_remove_trigger(indio_dev);
        ad7793_ring_cleanup(indio_dev);
 

diff --git a/drivers/staging/iio/adc/ad7887_core.c b/drivers/staging/iio/adc/ad7887_core.c
index 74e222f92431fd2e40d96dc69d1cbfcc5dc0f3a9..184ead17afce4992d7a4a352f7844992b8663fed 100644 (file)
--- a/drivers/staging/iio/adc/ad7887_core.c
+++ b/drivers/staging/iio/adc/ad7887_core.c
@@ -194,7 +194,7 @@ static int __devinit ad7887_probe(struct spi_device *spi)
                goto error_disable_reg;
        regdone = 1;
 
-       ret = iio_ring_buffer_register_ex(indio_dev->ring, 0,
+       ret = iio_ring_buffer_register_ex(indio_dev, 0,
                                          indio_dev->channels,
                                          indio_dev->num_channels);
        if (ret)
@@ -222,7 +222,7 @@ static int ad7887_remove(struct spi_device *spi)
        struct iio_dev *indio_dev = spi_get_drvdata(spi);
        struct ad7887_state *st = iio_priv(indio_dev);
 
-       iio_ring_buffer_unregister(indio_dev->ring);
+       iio_ring_buffer_unregister(indio_dev);
        ad7887_ring_cleanup(indio_dev);
        if (!IS_ERR(st->reg)) {
                regulator_disable(st->reg);

diff --git a/drivers/staging/iio/adc/ad799x_core.c b/drivers/staging/iio/adc/ad799x_core.c
index f1b044b603659a4d201d9efd6cf405e422145992..ba6d4ed0d609b1ad25e752168f2fc3813656ed1e 100644 (file)
--- a/drivers/staging/iio/adc/ad799x_core.c
+++ b/drivers/staging/iio/adc/ad799x_core.c
@@ -708,7 +708,7 @@ static int __devinit ad799x_probe(struct i2c_client *client,
                goto error_cleanup_ring;
        regdone = 1;
 
-       ret = iio_ring_buffer_register_ex(indio_dev->ring, 0,
+       ret = iio_ring_buffer_register_ex(indio_dev, 0,
                                          indio_dev->channels,
                                          indio_dev->num_channels);
        if (ret)
@@ -752,7 +752,7 @@ static __devexit int ad799x_remove(struct i2c_client *client)
        if (client->irq > 0)
                free_irq(client->irq, indio_dev);
 
-       iio_ring_buffer_unregister(indio_dev->ring);
+       iio_ring_buffer_unregister(indio_dev);
        ad799x_ring_cleanup(indio_dev);
        if (!IS_ERR(st->reg)) {
                regulator_disable(st->reg);

diff --git a/drivers/staging/iio/adc/max1363_core.c b/drivers/staging/iio/adc/max1363_core.c
index 0bf7b74966b5d8897a71e5f97ee063b63fc65722..53b745143ae3da99be0c0deb81c6bb510f9681be 100644 (file)
--- a/drivers/staging/iio/adc/max1363_core.c
+++ b/drivers/staging/iio/adc/max1363_core.c
@@ -1315,7 +1315,7 @@ static int __devinit max1363_probe(struct i2c_client *client,
        if (ret)
                goto error_cleanup_ring;
        regdone = 1;
-       ret = iio_ring_buffer_register_ex(indio_dev->ring, 0,
+       ret = iio_ring_buffer_register_ex(indio_dev, 0,
                                          st->chip_info->channels,
                                          st->chip_info->num_channels);
        if (ret)
@@ -1336,7 +1336,7 @@ static int __devinit max1363_probe(struct i2c_client *client,
        return 0;
 
 error_uninit_ring:
-       iio_ring_buffer_unregister(indio_dev->ring);
+       iio_ring_buffer_unregister(indio_dev);
 error_cleanup_ring:
        max1363_ring_cleanup(indio_dev);
 error_free_available_scan_masks:
@@ -1362,7 +1362,7 @@ static int max1363_remove(struct i2c_client *client)
 
        if (client->irq)
                free_irq(st->client->irq, indio_dev);
-       iio_ring_buffer_unregister(indio_dev->ring);
+       iio_ring_buffer_unregister(indio_dev);
        max1363_ring_cleanup(indio_dev);
        kfree(indio_dev->available_scan_masks);
        if (!IS_ERR(reg)) {

diff --git a/drivers/staging/iio/gyro/adis16260_core.c b/drivers/staging/iio/gyro/adis16260_core.c
index fcd7819a124688429aacb80644c6991e5318c1ce..5541cdda1762766a9c66f8cae141b73940ed6843 100644 (file)
--- a/drivers/staging/iio/gyro/adis16260_core.c
+++ b/drivers/staging/iio/gyro/adis16260_core.c
@@ -629,7 +629,7 @@ static int __devinit adis16260_probe(struct spi_device *spi)
        if (ret)
                goto error_unreg_ring_funcs;
        regdone = 1;
-       ret = iio_ring_buffer_register_ex(indio_dev->ring, 0,
+       ret = iio_ring_buffer_register_ex(indio_dev, 0,
                                          indio_dev->channels,
                                          ARRAY_SIZE(adis16260_channels_x));
        if (ret) {
@@ -652,7 +652,7 @@ static int __devinit adis16260_probe(struct spi_device *spi)
 error_remove_trigger:
        adis16260_remove_trigger(indio_dev);
 error_uninitialize_ring:
-       iio_ring_buffer_unregister(indio_dev->ring);
+       iio_ring_buffer_unregister(indio_dev);
 error_unreg_ring_funcs:
        adis16260_unconfigure_ring(indio_dev);
 error_free_dev:
@@ -676,7 +676,7 @@ static int adis16260_remove(struct spi_device *spi)
        flush_scheduled_work();
 
        adis16260_remove_trigger(indio_dev);
-       iio_ring_buffer_unregister(indio_dev->ring);
+       iio_ring_buffer_unregister(indio_dev);
        iio_device_unregister(indio_dev);
        adis16260_unconfigure_ring(indio_dev);
 

diff --git a/drivers/staging/iio/iio.h b/drivers/staging/iio/iio.h
index 5b61a7eaaf0cfb5c3849fda516973efafab71456..239219b9949d9360e7e91947f60093b5d049a4ff 100644 (file)
--- a/drivers/staging/iio/iio.h
+++ b/drivers/staging/iio/iio.h
@@ -245,7 +245,6 @@ struct iio_info {
 
 };
 
-int iio_event_getfd(struct iio_dev *indio_dev);
 /**
  * struct iio_dev - industrial I/O device
  * @id:                        [INTERN] used to identify device internally
@@ -288,6 +287,7 @@ struct iio_dev {
        struct list_head channel_attr_list;
        const char *name;
        const struct iio_info *info;
+       struct cdev                             chrdev;
 };
 
 /**

diff --git a/drivers/staging/iio/iio_core.h b/drivers/staging/iio/iio_core.h
index 00e894d50e747cf3d5244f48a9d726b1c18d4cba..a27fa05d6609acf8822b4abe24a6c9337ee97fa1 100644 (file)
--- a/drivers/staging/iio/iio_core.h
+++ b/drivers/staging/iio/iio_core.h
@@ -10,6 +10,9 @@
  * drivers.
  */
 
+#ifndef _IIO_CORE_H_
+#define _IIO_CORE_H_
+
 /**
  * iio_device_get_chrdev_minor() - get an unused minor number
  **/
@@ -46,3 +49,32 @@ int __iio_add_chan_devattr(const char *postfix,
 
 /* Event interface flags */
 #define IIO_BUSY_BIT_POS 1
+
+#ifdef CONFIG_IIO_RING_BUFFER
+struct poll_table_struct;
+
+void iio_chrdev_ring_open(struct iio_dev *indio_dev);
+void iio_chrdev_ring_release(struct iio_dev *indio_dev);
+
+unsigned int iio_ring_poll(struct file *filp,
+                          struct poll_table_struct *wait);
+ssize_t iio_ring_read_first_n_outer(struct file *filp, char __user *buf,
+                                   size_t n, loff_t *f_ps);
+
+
+#define iio_ring_poll_addr (&iio_ring_poll)
+#define iio_ring_read_first_n_outer_addr (&iio_ring_read_first_n_outer)
+
+#else
+
+static inline void iio_chrdev_ring_open(struct iio_dev *indio_dev)
+{}
+static inline void iio_chrdev_ring_release(struct iio_dev *indio_dev)
+{}
+
+#define iio_ring_poll_addr NULL
+#define iio_ring_read_first_n_outer_addr NULL
+
+#endif
+
+#endif

diff --git a/drivers/staging/iio/impedance-analyzer/ad5933.c b/drivers/staging/iio/impedance-analyzer/ad5933.c
index acc0e69cb58874a05e02521e5a2f7e96aea0ae8b..8668291ffdc76b753aaef863027df020091dc5f6 100644 (file)
--- a/drivers/staging/iio/impedance-analyzer/ad5933.c
+++ b/drivers/staging/iio/impedance-analyzer/ad5933.c
@@ -733,9 +733,7 @@ static int __devinit ad5933_probe(struct i2c_client *client,
        regdone = 1;
 
        /* skip temp0_input, register in0_(real|imag)_raw */
-       ret = iio_ring_buffer_register_ex(indio_dev->ring, 0,
-                                         &ad5933_channels[1],
-                                         2);
+       ret = iio_ring_buffer_register_ex(indio_dev, 0, &ad5933_channels[1], 2);
        if (ret)
                goto error_unreg_ring;
 
@@ -750,7 +748,7 @@ static int __devinit ad5933_probe(struct i2c_client *client,
        return 0;
 
 error_uninitialize_ring:
-       iio_ring_buffer_unregister(indio_dev->ring);
+       iio_ring_buffer_unregister(indio_dev);
 error_unreg_ring:
        iio_sw_rb_free(indio_dev->ring);
 error_disable_reg:
@@ -773,7 +771,7 @@ static __devexit int ad5933_remove(struct i2c_client *client)
        struct iio_dev *indio_dev = i2c_get_clientdata(client);
        struct ad5933_state *st = iio_priv(indio_dev);
 
-       iio_ring_buffer_unregister(indio_dev->ring);
+       iio_ring_buffer_unregister(indio_dev);
        iio_sw_rb_free(indio_dev->ring);
        if (!IS_ERR(st->reg)) {
                regulator_disable(st->reg);

diff --git a/drivers/staging/iio/imu/adis16400_core.c b/drivers/staging/iio/imu/adis16400_core.c
index 58a29b1e243c0bfa14fee48b6f31c05b16f3b93a..21c1a0768d676d7a79bf6044fa74d894a69c4836 100644 (file)
--- a/drivers/staging/iio/imu/adis16400_core.c
+++ b/drivers/staging/iio/imu/adis16400_core.c
@@ -853,7 +853,7 @@ static int __devinit adis16400_probe(struct spi_device *spi)
                goto error_unreg_ring_funcs;
        regdone = 1;
 
-       ret = iio_ring_buffer_register_ex(indio_dev->ring, 0,
+       ret = iio_ring_buffer_register_ex(indio_dev, 0,
                                          st->variant->channels,
                                          st->variant->num_channels);
        if (ret) {
@@ -877,7 +877,7 @@ error_remove_trigger:
        if (indio_dev->modes & INDIO_RING_TRIGGERED)
                adis16400_remove_trigger(indio_dev);
 error_uninitialize_ring:
-       iio_ring_buffer_unregister(indio_dev->ring);
+       iio_ring_buffer_unregister(indio_dev);
 error_unreg_ring_funcs:
        adis16400_unconfigure_ring(indio_dev);
 error_free_dev:
@@ -900,7 +900,7 @@ static int adis16400_remove(struct spi_device *spi)
                goto err_ret;
 
        adis16400_remove_trigger(indio_dev);
-       iio_ring_buffer_unregister(indio_dev->ring);
+       iio_ring_buffer_unregister(indio_dev);
        adis16400_unconfigure_ring(indio_dev);
        iio_device_unregister(indio_dev);
 

diff --git a/drivers/staging/iio/industrialio-core.c b/drivers/staging/iio/industrialio-core.c
index 2b72398ea735177a777815f461efc98b79c3060c..e55edfa5586d39efbc5c91bdafd86b079e322391 100644 (file)
--- a/drivers/staging/iio/industrialio-core.c
+++ b/drivers/staging/iio/industrialio-core.c
@@ -292,7 +292,7 @@ void iio_device_free_chrdev_minor(int val)
        iio_free_ida_val(&iio_chrdev_ida, val);
 }
 
-int iio_event_getfd(struct iio_dev *indio_dev)
+static int iio_event_getfd(struct iio_dev *indio_dev)
 {
        if (indio_dev->event_interfaces == NULL)
                return -ENODEV;
@@ -1079,6 +1079,8 @@ static void iio_device_unregister_eventset(struct iio_dev *dev_info)
 static void iio_dev_release(struct device *device)
 {
        struct iio_dev *dev_info = container_of(device, struct iio_dev, dev);
+       cdev_del(&dev_info->chrdev);
+       iio_device_free_chrdev_minor(MINOR(device->devt));
        iio_put();
        kfree(dev_info);
 }
@@ -1118,11 +1120,63 @@ EXPORT_SYMBOL(iio_allocate_device);
 
 void iio_free_device(struct iio_dev *dev)
 {
-       if (dev)
-               iio_put_device(dev);
+       if (dev) {
+               iio_put();
+               kfree(dev);
+       }
 }
 EXPORT_SYMBOL(iio_free_device);
 
+/**
+ * iio_chrdev_open() - chrdev file open for ring buffer access and ioctls
+ **/
+static int iio_chrdev_open(struct inode *inode, struct file *filp)
+{
+       struct iio_dev *dev_info = container_of(inode->i_cdev,
+                                               struct iio_dev, chrdev);
+       filp->private_data = dev_info;
+       iio_chrdev_ring_open(dev_info);
+       return 0;
+}
+
+/**
+ * iio_chrdev_release() - chrdev file close ring buffer access and ioctls
+ **/
+static int iio_chrdev_release(struct inode *inode, struct file *filp)
+{
+       iio_chrdev_ring_release(container_of(inode->i_cdev,
+                                            struct iio_dev, chrdev));
+       return 0;
+}
+
+/* Somewhat of a cross file organization violation - ioctls here are actually
+ * event related */
+static long iio_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
+{
+       struct iio_dev *indio_dev = filp->private_data;
+       int __user *ip = (int __user *)arg;
+       int fd;
+
+       if (cmd == IIO_GET_EVENT_FD_IOCTL) {
+               fd = iio_event_getfd(indio_dev);
+               if (copy_to_user(ip, &fd, sizeof(fd)))
+                       return -EFAULT;
+               return 0;
+       }
+       return -EINVAL;
+}
+
+static const struct file_operations iio_ring_fileops = {
+       .read = iio_ring_read_first_n_outer_addr,
+       .release = iio_chrdev_release,
+       .open = iio_chrdev_open,
+       .poll = iio_ring_poll_addr,
+       .owner = THIS_MODULE,
+       .llseek = noop_llseek,
+       .unlocked_ioctl = iio_ioctl,
+       .compat_ioctl = iio_ioctl,
+};
+
 int iio_device_register(struct iio_dev *dev_info)
 {
        int ret;
@@ -1133,7 +1187,13 @@ int iio_device_register(struct iio_dev *dev_info)
                dev_err(&dev_info->dev, "Failed to get id\n");
                goto error_ret;
        }
-       dev_set_name(&dev_info->dev, "device%d", dev_info->id);
+       dev_set_name(&dev_info->dev, "iio:device%d", dev_info->id);
+       ret = iio_device_get_chrdev_minor();
+       if (ret < 0)
+               goto error_free_ida;
+
+       /* configure elements for the chrdev */
+       dev_info->dev.devt = MKDEV(MAJOR(iio_devt), ret);
 
        ret = device_add(&dev_info->dev);
        if (ret)
@@ -1153,6 +1213,9 @@ int iio_device_register(struct iio_dev *dev_info)
        if (dev_info->modes & INDIO_RING_TRIGGERED)
                iio_device_register_trigger_consumer(dev_info);
 
+       cdev_init(&dev_info->chrdev, &iio_ring_fileops);
+       dev_info->chrdev.owner = dev_info->info->driver_module;
+       ret = cdev_add(&dev_info->chrdev, dev_info->dev.devt, 1);
        return 0;
 
 error_free_sysfs:

diff --git a/drivers/staging/iio/industrialio-ring.c b/drivers/staging/iio/industrialio-ring.c
index cce02244cebebe645782aa9532e187a68aadded9..1607293b036dcb0c20eddf68efe4b5aa2009b135 100644 (file)
--- a/drivers/staging/iio/industrialio-ring.c
+++ b/drivers/staging/iio/industrialio-ring.c
@@ -24,42 +24,6 @@
 #include "iio_core.h"
 #include "ring_generic.h"
 
-/**
- * iio_ring_open() - chrdev file open for ring buffer access
- *
- * This function relies on all ring buffer implementations having an
- * iio_ring_buffer as their first element.
- **/
-static int iio_ring_open(struct inode *inode, struct file *filp)
-{
-       struct iio_ring_buffer *rb
-               = container_of(inode->i_cdev,
-                              struct iio_ring_buffer, chrdev);
-       filp->private_data = rb;
-       if (rb->access->mark_in_use)
-               rb->access->mark_in_use(rb);
-
-       return 0;
-}
-
-/**
- * iio_ring_release() - chrdev file close ring buffer access
- *
- * This function relies on all ring buffer implementations having an
- * iio_ring_buffer as their first element.
- **/
-static int iio_ring_release(struct inode *inode, struct file *filp)
-{
-       struct iio_ring_buffer *rb
-               = container_of(inode->i_cdev,
-                              struct iio_ring_buffer, chrdev);
-
-       clear_bit(IIO_BUSY_BIT_POS, &rb->flags);
-       if (rb->access->unmark_in_use)
-               rb->access->unmark_in_use(rb);
-
-       return 0;
-}
 
 /**
  * iio_ring_read_first_n_outer() - chrdev read for ring buffer access
@@ -67,10 +31,11 @@ static int iio_ring_release(struct inode *inode, struct file *filp)
  * This function relies on all ring buffer implementations having an
  * iio_ring _bufer as their first element.
  **/
-static ssize_t iio_ring_read_first_n_outer(struct file *filp, char __user *buf,
-                                 size_t n, loff_t *f_ps)
+ssize_t iio_ring_read_first_n_outer(struct file *filp, char __user *buf,
+                                   size_t n, loff_t *f_ps)
 {
-       struct iio_ring_buffer *rb = filp->private_data;
+       struct iio_dev *indio_dev = filp->private_data;
+       struct iio_ring_buffer *rb = indio_dev->ring;
 
        if (!rb->access->read_first_n)
                return -EINVAL;
@@ -80,10 +45,11 @@ static ssize_t iio_ring_read_first_n_outer(struct file *filp, char __user *buf,
 /**
  * iio_ring_poll() - poll the ring to find out if it has data
  */
-static unsigned int iio_ring_poll(struct file *filp,
-                                 struct poll_table_struct *wait)
+unsigned int iio_ring_poll(struct file *filp,
+                          struct poll_table_struct *wait)
 {
-       struct iio_ring_buffer *rb = filp->private_data;
+       struct iio_dev *indio_dev = filp->private_data;
+       struct iio_ring_buffer *rb = indio_dev->ring;
 
        poll_wait(filp, &rb->pollq, wait);
        if (rb->stufftoread)
@@ -92,89 +58,21 @@ static unsigned int iio_ring_poll(struct file *filp,
        return 0;
 }
 
-/* Somewhat of a cross file organization violation - ioctls here are actually
- * event related */
-static long iio_ioctl(struct file *f, unsigned int cmd, unsigned long arg)
-{
-
-       struct iio_ring_buffer *rb = f->private_data;
-       struct iio_dev *indio_dev = rb->indio_dev;
-       int __user *ip = (int __user *)arg;
-
-       if (cmd == IIO_GET_EVENT_FD_IOCTL) {
-               int fd;
-               fd = iio_event_getfd(indio_dev);
-               if (copy_to_user(ip, &fd, sizeof(fd)))
-                       return -EFAULT;
-               return 0;
-       }
-       return -EINVAL;
-}
-
-static const struct file_operations iio_ring_fileops = {
-       .read = iio_ring_read_first_n_outer,
-       .release = iio_ring_release,
-       .open = iio_ring_open,
-       .poll = iio_ring_poll,
-       .owner = THIS_MODULE,
-       .llseek = noop_llseek,
-       .unlocked_ioctl = iio_ioctl,
-       .compat_ioctl = iio_ioctl,
-};
-
-void iio_ring_access_release(struct device *dev)
+void iio_chrdev_ring_open(struct iio_dev *indio_dev)
 {
-       struct iio_ring_buffer *buf
-               = container_of(dev, struct iio_ring_buffer, dev);
-       cdev_del(&buf->chrdev);
-       iio_device_free_chrdev_minor(MINOR(dev->devt));
+       struct iio_ring_buffer *rb = indio_dev->ring;
+       if (rb && rb->access->mark_in_use)
+               rb->access->mark_in_use(rb);
 }
-EXPORT_SYMBOL(iio_ring_access_release);
 
-static inline int
-__iio_request_ring_buffer_chrdev(struct iio_ring_buffer *buf,
-                                struct module *owner,
-                                int id)
+void iio_chrdev_ring_release(struct iio_dev *indio_dev)
 {
-       int ret;
-
-       buf->flags = 0;
-       buf->dev.bus = &iio_bus_type;
-       device_initialize(&buf->dev);
-
-       ret = iio_device_get_chrdev_minor();
-       if (ret < 0)
-               goto error_device_put;
-
-       buf->dev.devt = MKDEV(MAJOR(iio_devt), ret);
-       dev_set_name(&buf->dev, "%s:buffer%d",
-                    dev_name(buf->dev.parent),
-                    id);
-       ret = device_add(&buf->dev);
-       if (ret < 0) {
-               printk(KERN_ERR "failed to add the ring dev\n");
-               goto error_device_put;
-       }
-       cdev_init(&buf->chrdev, &iio_ring_fileops);
-       buf->chrdev.owner = owner;
-       ret = cdev_add(&buf->chrdev, buf->dev.devt, 1);
-       if (ret) {
-               printk(KERN_ERR "failed to allocate ring chrdev\n");
-               goto error_device_unregister;
-       }
-       return 0;
+       struct iio_ring_buffer *rb = indio_dev->ring;
 
-error_device_unregister:
-       device_unregister(&buf->dev);
-error_device_put:
-       put_device(&buf->dev);
-
-       return ret;
-}
+       clear_bit(IIO_BUSY_BIT_POS, &rb->flags);
+       if (rb->access->unmark_in_use)
+               rb->access->unmark_in_use(rb);
 
-static void __iio_free_ring_buffer_chrdev(struct iio_ring_buffer *buf)
-{
-       device_unregister(&buf->dev);
 }
 
 void iio_ring_buffer_init(struct iio_ring_buffer *ring,
@@ -209,9 +107,10 @@ static ssize_t iio_scan_el_show(struct device *dev,
                                char *buf)
 {
        int ret;
-       struct iio_ring_buffer *ring = dev_get_drvdata(dev);
+       struct iio_dev *dev_info = dev_get_drvdata(dev);
 
-       ret = iio_scan_mask_query(ring, to_iio_dev_attr(attr)->address);
+       ret = iio_scan_mask_query(dev_info->ring,
+                                 to_iio_dev_attr(attr)->address);
        if (ret < 0)
                return ret;
        return sprintf(buf, "%d\n", ret);
@@ -233,8 +132,8 @@ static ssize_t iio_scan_el_store(struct device *dev,
 {
        int ret = 0;
        bool state;
-       struct iio_ring_buffer *ring = dev_get_drvdata(dev);
-       struct iio_dev *indio_dev = ring->indio_dev;
+       struct iio_dev *indio_dev = dev_get_drvdata(dev);
+       struct iio_ring_buffer *ring = indio_dev->ring;
        struct iio_dev_attr *this_attr = to_iio_dev_attr(attr);
 
        state = !(buf[0] == '0');
@@ -267,8 +166,8 @@ static ssize_t iio_scan_el_ts_show(struct device *dev,
                                   struct device_attribute *attr,
                                   char *buf)
 {
-       struct iio_ring_buffer *ring = dev_get_drvdata(dev);
-       return sprintf(buf, "%d\n", ring->scan_timestamp);
+       struct iio_dev *dev_info = dev_get_drvdata(dev);
+       return sprintf(buf, "%d\n", dev_info->ring->scan_timestamp);
 }
 
 static ssize_t iio_scan_el_ts_store(struct device *dev,
@@ -277,26 +176,27 @@ static ssize_t iio_scan_el_ts_store(struct device *dev,
                                    size_t len)
 {
        int ret = 0;
-       struct iio_ring_buffer *ring = dev_get_drvdata(dev);
-       struct iio_dev *indio_dev = ring->indio_dev;
+       struct iio_dev *indio_dev = dev_get_drvdata(dev);
        bool state;
+
        state = !(buf[0] == '0');
        mutex_lock(&indio_dev->mlock);
        if (indio_dev->currentmode == INDIO_RING_TRIGGERED) {
                ret = -EBUSY;
                goto error_ret;
        }
-       ring->scan_timestamp = state;
+       indio_dev->ring->scan_timestamp = state;
 error_ret:
        mutex_unlock(&indio_dev->mlock);
 
        return ret ? ret : len;
 }
 
-static int iio_ring_add_channel_sysfs(struct iio_ring_buffer *ring,
+static int iio_ring_add_channel_sysfs(struct iio_dev *indio_dev,
                                      const struct iio_chan_spec *chan)
 {
        int ret;
+       struct iio_ring_buffer *ring = indio_dev->ring;
 
        ret = __iio_add_chan_devattr("index", "scan_elements",
                                     chan,
@@ -304,7 +204,7 @@ static int iio_ring_add_channel_sysfs(struct iio_ring_buffer *ring,
                                     NULL,
                                     0,
                                     0,
-                                    &ring->dev,
+                                    &indio_dev->dev,
                                     &ring->scan_el_dev_attr_list);
        if (ret)
                goto error_ret;
@@ -315,7 +215,7 @@ static int iio_ring_add_channel_sysfs(struct iio_ring_buffer *ring,
                                     NULL,
                                     0,
                                     0,
-                                    &ring->dev,
+                                    &indio_dev->dev,
                                     &ring->scan_el_dev_attr_list);
        if (ret)
                goto error_ret;
@@ -327,7 +227,7 @@ static int iio_ring_add_channel_sysfs(struct iio_ring_buffer *ring,
                                             &iio_scan_el_store,
                                             chan->scan_index,
                                             0,
-                                            &ring->dev,
+                                            &indio_dev->dev,
                                             &ring->scan_el_dev_attr_list);
        else
                ret = __iio_add_chan_devattr("en", "scan_elements",
@@ -336,16 +236,16 @@ static int iio_ring_add_channel_sysfs(struct iio_ring_buffer *ring,
                                             &iio_scan_el_ts_store,
                                             chan->scan_index,
                                             0,
-                                            &ring->dev,
+                                            &indio_dev->dev,
                                             &ring->scan_el_dev_attr_list);
 error_ret:
        return ret;
 }
 
-static void iio_ring_remove_and_free_scan_dev_attr(struct iio_ring_buffer *ring,
+static void iio_ring_remove_and_free_scan_dev_attr(struct iio_dev *indio_dev,
                                                   struct iio_dev_attr *p)
 {
-       sysfs_remove_file_from_group(&ring->dev.kobj,
+       sysfs_remove_file_from_group(&indio_dev->dev.kobj,
                                     &p->dev_attr.attr, "scan_elements");
        kfree(p->dev_attr.attr.name);
        kfree(p);
@@ -360,71 +260,79 @@ static struct attribute_group iio_scan_el_dummy_group = {
        .attrs = iio_scan_el_dummy_attrs
 };
 
-static void __iio_ring_attr_cleanup(struct iio_ring_buffer *ring)
+static void __iio_ring_attr_cleanup(struct iio_dev *indio_dev)
 {
        struct iio_dev_attr *p, *n;
+       struct iio_ring_buffer *ring = indio_dev->ring;
        int anydynamic = !list_empty(&ring->scan_el_dev_attr_list);
        list_for_each_entry_safe(p, n,
                                 &ring->scan_el_dev_attr_list, l)
-               iio_ring_remove_and_free_scan_dev_attr(ring, p);
+               iio_ring_remove_and_free_scan_dev_attr(indio_dev, p);
 
        if (ring->scan_el_attrs)
-               sysfs_remove_group(&ring->dev.kobj,
+               sysfs_remove_group(&indio_dev->dev.kobj,
                                   ring->scan_el_attrs);
        else if (anydynamic)
-               sysfs_remove_group(&ring->dev.kobj,
+               sysfs_remove_group(&indio_dev->dev.kobj,
                                   &iio_scan_el_dummy_group);
 }
 
-int iio_ring_buffer_register_ex(struct iio_ring_buffer *ring, int id,
+int iio_ring_buffer_register_ex(struct iio_dev *indio_dev, int id,
                                const struct iio_chan_spec *channels,
                                int num_channels)
 {
+       struct iio_ring_buffer *ring = indio_dev->ring;
        int ret, i;
 
-       ret = __iio_request_ring_buffer_chrdev(ring, ring->owner, id);
-       if (ret)
-               goto error_ret;
-
        if (ring->scan_el_attrs) {
-               ret = sysfs_create_group(&ring->dev.kobj,
+               ret = sysfs_create_group(&indio_dev->dev.kobj,
                                         ring->scan_el_attrs);
                if (ret) {
-                       dev_err(&ring->dev,
+                       dev_err(&indio_dev->dev,
                                "Failed to add sysfs scan elements\n");
-                       goto error_free_ring_buffer_chrdev;
+                       goto error_ret;
                }
        } else if (channels) {
-               ret = sysfs_create_group(&ring->dev.kobj,
+               ret = sysfs_create_group(&indio_dev->dev.kobj,
                                         &iio_scan_el_dummy_group);
                if (ret)
-                       goto error_free_ring_buffer_chrdev;
+                       goto error_ret;
+       }
+       if (ring->attrs) {
+               ret = sysfs_create_group(&indio_dev->dev.kobj,
+                                        ring->attrs);
+               if (ret)
+                       goto error_cleanup_dynamic;
        }
 
        INIT_LIST_HEAD(&ring->scan_el_dev_attr_list);
        if (channels) {
                /* new magic */
                for (i = 0; i < num_channels; i++) {
-                       ret = iio_ring_add_channel_sysfs(ring, &channels[i]);
+                       ret = iio_ring_add_channel_sysfs(indio_dev,
+                                                        &channels[i]);
                        if (ret < 0)
-                               goto error_cleanup_dynamic;
+                               goto error_cleanup_group;
                }
        }
 
        return 0;
+error_cleanup_group:
+       if (ring->attrs)
+               sysfs_remove_group(&indio_dev->dev.kobj, ring->attrs);
 error_cleanup_dynamic:
-       __iio_ring_attr_cleanup(ring);
-error_free_ring_buffer_chrdev:
-       __iio_free_ring_buffer_chrdev(ring);
+       __iio_ring_attr_cleanup(indio_dev);
 error_ret:
        return ret;
 }
 EXPORT_SYMBOL(iio_ring_buffer_register_ex);
 
-void iio_ring_buffer_unregister(struct iio_ring_buffer *ring)
+void iio_ring_buffer_unregister(struct iio_dev *indio_dev)
 {
-       __iio_ring_attr_cleanup(ring);
-       __iio_free_ring_buffer_chrdev(ring);
+       if (indio_dev->ring->attrs)
+               sysfs_remove_group(&indio_dev->dev.kobj,
+                                  indio_dev->ring->attrs);
+       __iio_ring_attr_cleanup(indio_dev);
 }
 EXPORT_SYMBOL(iio_ring_buffer_unregister);
 
@@ -432,7 +340,8 @@ ssize_t iio_read_ring_length(struct device *dev,
                             struct device_attribute *attr,
                             char *buf)
 {
-       struct iio_ring_buffer *ring = dev_get_drvdata(dev);
+       struct iio_dev *indio_dev = dev_get_drvdata(dev);
+       struct iio_ring_buffer *ring = indio_dev->ring;
 
        if (ring->access->get_length)
                return sprintf(buf, "%d\n",
@@ -449,7 +358,8 @@ ssize_t iio_write_ring_length(struct device *dev,
 {
        int ret;
        ulong val;
-       struct iio_ring_buffer *ring = dev_get_drvdata(dev);
+       struct iio_dev *indio_dev = dev_get_drvdata(dev);
+       struct iio_ring_buffer *ring = indio_dev->ring;
 
        ret = strict_strtoul(buf, 10, &val);
        if (ret)
@@ -473,7 +383,8 @@ ssize_t iio_read_ring_bytes_per_datum(struct device *dev,
                          struct device_attribute *attr,
                          char *buf)
 {
-       struct iio_ring_buffer *ring = dev_get_drvdata(dev);
+       struct iio_dev *indio_dev = dev_get_drvdata(dev);
+       struct iio_ring_buffer *ring = indio_dev->ring;
 
        if (ring->access->get_bytes_per_datum)
                return sprintf(buf, "%d\n",
@@ -491,8 +402,8 @@ ssize_t iio_store_ring_enable(struct device *dev,
        int ret;
        bool requested_state, current_state;
        int previous_mode;
-       struct iio_ring_buffer *ring = dev_get_drvdata(dev);
-       struct iio_dev *dev_info = ring->indio_dev;
+       struct iio_dev *dev_info = dev_get_drvdata(dev);
+       struct iio_ring_buffer *ring = dev_info->ring;
 
        mutex_lock(&dev_info->mlock);
        previous_mode = dev_info->currentmode;
@@ -584,8 +495,8 @@ ssize_t iio_show_ring_enable(struct device *dev,
                                    struct device_attribute *attr,
                                    char *buf)
 {
-       struct iio_ring_buffer *ring = dev_get_drvdata(dev);
-       return sprintf(buf, "%d\n", !!(ring->indio_dev->currentmode
+       struct iio_dev *dev_info = dev_get_drvdata(dev);
+       return sprintf(buf, "%d\n", !!(dev_info->currentmode
                                       & INDIO_ALL_RING_MODES));
 }
 EXPORT_SYMBOL(iio_show_ring_enable);

diff --git a/drivers/staging/iio/kfifo_buf.c b/drivers/staging/iio/kfifo_buf.c
index 3c9516b2a670727de8efa9be762fa00096c8b9f2..39b058557f69de196a5d356d1d9c563f0efd2981 100644 (file)
--- a/drivers/staging/iio/kfifo_buf.c
+++ b/drivers/staging/iio/kfifo_buf.c
@@ -87,24 +87,7 @@ static struct attribute *iio_kfifo_attributes[] = {
 
 static struct attribute_group iio_kfifo_attribute_group = {
        .attrs = iio_kfifo_attributes,
-};
-
-static const struct attribute_group *iio_kfifo_attribute_groups[] = {
-       &iio_kfifo_attribute_group,
-       NULL
-};
-
-static void iio_kfifo_release(struct device *dev)
-{
-       struct iio_ring_buffer *r = to_iio_ring_buffer(dev);
-       struct iio_kfifo *kf = iio_to_kfifo(r);
-       kfifo_free(&kf->kf);
-       kfree(kf);
-}
-
-static struct device_type iio_kfifo_type = {
-       .release = iio_kfifo_release,
-       .groups = iio_kfifo_attribute_groups,
+       .name = "buffer",
 };
 
 struct iio_ring_buffer *iio_kfifo_allocate(struct iio_dev *indio_dev)
@@ -116,10 +99,8 @@ struct iio_ring_buffer *iio_kfifo_allocate(struct iio_dev *indio_dev)
                return NULL;
        kf->update_needed = true;
        iio_ring_buffer_init(&kf->ring, indio_dev);
+       kf->ring.attrs = &iio_kfifo_attribute_group;
        __iio_init_kfifo(kf);
-       kf->ring.dev.type = &iio_kfifo_type;
-       kf->ring.dev.parent = &indio_dev->dev;
-       dev_set_drvdata(&kf->ring.dev, (void *)&(kf->ring));
 
        return &kf->ring;
 }
@@ -159,8 +140,7 @@ static int iio_set_length_kfifo(struct iio_ring_buffer *r, int length)
 
 void iio_kfifo_free(struct iio_ring_buffer *r)
 {
-       if (r)
-               iio_put_ring_buffer(r);
+       kfree(iio_to_kfifo(r));
 }
 EXPORT_SYMBOL(iio_kfifo_free);
 

diff --git a/drivers/staging/iio/meter/ade7758.h b/drivers/staging/iio/meter/ade7758.h
index fd74e156abf9b8bc9572c3ea2b91cbc7ef86d230..4d73e1a38815bd375c3f3a231f1ce5eb98bcc70d 100644 (file)
--- a/drivers/staging/iio/meter/ade7758.h
+++ b/drivers/staging/iio/meter/ade7758.h
@@ -150,8 +150,7 @@ ssize_t ade7758_read_data_from_ring(struct device *dev,
 int ade7758_configure_ring(struct iio_dev *indio_dev);
 void ade7758_unconfigure_ring(struct iio_dev *indio_dev);
 
-int ade7758_initialize_ring(struct iio_ring_buffer *ring);
-void ade7758_uninitialize_ring(struct iio_ring_buffer *ring);
+void ade7758_uninitialize_ring(struct iio_dev *indio_dev);
 int ade7758_set_irq(struct device *dev, bool enable);
 
 int ade7758_spi_write_reg_8(struct device *dev,
@@ -180,7 +179,7 @@ static inline int ade7758_initialize_ring(struct iio_ring_buffer *ring)
 {
        return 0;
 }
-static inline void ade7758_uninitialize_ring(struct iio_ring_buffer *ring)
+static inline void ade7758_uninitialize_ring(struct iio_dev *indio_dev)
 {
 }
 #endif /* CONFIG_IIO_RING_BUFFER */

diff --git a/drivers/staging/iio/meter/ade7758_core.c b/drivers/staging/iio/meter/ade7758_core.c
index ac0e092e49d37759388328554b8cf83604865a97..92c6dcc4f733d58401bdd38cef9b86c698ee6a81 100644 (file)
--- a/drivers/staging/iio/meter/ade7758_core.c
+++ b/drivers/staging/iio/meter/ade7758_core.c
@@ -780,7 +780,7 @@ static int __devinit ade7758_probe(struct spi_device *spi)
                goto error_unreg_ring_funcs;
        regdone = 1;
 
-       ret = iio_ring_buffer_register_ex(indio_dev->ring, 0,
+       ret = iio_ring_buffer_register_ex(indio_dev, 0,
                                          &ade7758_channels[0],
                                          ARRAY_SIZE(ade7758_channels));
        if (ret) {
@@ -805,7 +805,7 @@ error_remove_trigger:
        if (indio_dev->modes & INDIO_RING_TRIGGERED)
                ade7758_remove_trigger(indio_dev);
 error_uninitialize_ring:
-       ade7758_uninitialize_ring(indio_dev->ring);
+       ade7758_uninitialize_ring(indio_dev);
 error_unreg_ring_funcs:
        ade7758_unconfigure_ring(indio_dev);
 error_free_tx:
@@ -832,7 +832,7 @@ static int ade7758_remove(struct spi_device *spi)
                goto err_ret;
 
        ade7758_remove_trigger(indio_dev);
-       ade7758_uninitialize_ring(indio_dev->ring);
+       ade7758_uninitialize_ring(indio_dev);
        ade7758_unconfigure_ring(indio_dev);
        kfree(st->tx);
        kfree(st->rx);

diff --git a/drivers/staging/iio/meter/ade7758_ring.c b/drivers/staging/iio/meter/ade7758_ring.c
index 1e2a09643a350e16765f23fd9b499b1bdd6ba6f4..5e740e386162cb9ab75dd3931a67338dbc8b7297 100644 (file)
--- a/drivers/staging/iio/meter/ade7758_ring.c
+++ b/drivers/staging/iio/meter/ade7758_ring.c
@@ -200,7 +200,7 @@ error_iio_sw_rb_free:
        return ret;
 }
 
-void ade7758_uninitialize_ring(struct iio_ring_buffer *ring)
+void ade7758_uninitialize_ring(struct iio_dev *indio_dev)
 {
-       iio_ring_buffer_unregister(ring);
+       iio_ring_buffer_unregister(indio_dev);
 }

diff --git a/drivers/staging/iio/ring_generic.h b/drivers/staging/iio/ring_generic.h
index 81bbe39ccc9ea4345abe1dc69a8a15a36222a778..db8d0d1469b9405a0052edc0e76c6550b043b99e 100644 (file)
--- a/drivers/staging/iio/ring_generic.h
+++ b/drivers/staging/iio/ring_generic.h
@@ -94,7 +94,6 @@ struct iio_ring_setup_ops {
  * @flags:             [INTERN] file ops related flags including busy flag.
  **/
 struct iio_ring_buffer {
-       struct device                           dev;
        struct iio_dev                          *indio_dev;
        struct module                           *owner;
        int                                     length;
@@ -111,7 +110,7 @@ struct iio_ring_buffer {
        wait_queue_head_t                       pollq;
        bool                                    stufftoread;
        unsigned long                           flags;
-       struct cdev                             chrdev;
+       const struct attribute_group *attrs;
 };
 
 /**
@@ -200,24 +199,15 @@ static inline int iio_scan_mask_set(struct iio_ring_buffer *ring, int bit)
        return 0;
 };
 
-/**
- * iio_put_ring_buffer() - notify done with buffer
- * @ring: the buffer we are done with.
- **/
-static inline void iio_put_ring_buffer(struct iio_ring_buffer *ring)
-{
-       put_device(&ring->dev);
-};
-
 #define to_iio_ring_buffer(d)                          \
        container_of(d, struct iio_ring_buffer, dev)
 
 /**
  * iio_ring_buffer_register_ex() - register the buffer with IIO core
- * @ring: the buffer to be registered
+ * @indio_dev: device with the buffer to be registered
  * @id: the id of the buffer (typically 0)
  **/
-int iio_ring_buffer_register_ex(struct iio_ring_buffer *ring, int id,
+int iio_ring_buffer_register_ex(struct iio_dev *indio_dev, int id,
                                const struct iio_chan_spec *channels,
                                int num_channels);
 
@@ -225,9 +215,9 @@ void iio_ring_access_release(struct device *dev);
 
 /**
  * iio_ring_buffer_unregister() - unregister the buffer from IIO core
- * @ring: the buffer to be unregistered
+ * @indio_dev: the device with the buffer to be unregistered
  **/
-void iio_ring_buffer_unregister(struct iio_ring_buffer *ring);
+void iio_ring_buffer_unregister(struct iio_dev *indio_dev);
 
 /**
  * iio_read_ring_length() - attr func to get number of datums in the buffer
@@ -274,7 +264,7 @@ int iio_sw_ring_preenable(struct iio_dev *indio_dev);
 
 #else /* CONFIG_IIO_RING_BUFFER */
 
-static inline int iio_ring_buffer_register_ex(struct iio_ring_buffer *ring,
+static inline int iio_ring_buffer_register_ex(struct iio_dev *indio_dev,
                                              int id,
                                              struct iio_chan_spec *channels,
                                              int num_channels)
@@ -282,7 +272,7 @@ static inline int iio_ring_buffer_register_ex(struct iio_ring_buffer *ring,
        return 0;
 }
 
-static inline void iio_ring_buffer_unregister(struct iio_ring_buffer *ring)
+static inline void iio_ring_buffer_unregister(struct iio_dev *indio_dev)
 {};
 
 #endif /* CONFIG_IIO_RING_BUFFER */

diff --git a/drivers/staging/iio/ring_sw.c b/drivers/staging/iio/ring_sw.c
index feb84e27c3626ca09979d0ea39031509cf0d5c3d..1905e033c41d76f9b0062bf07a0a6e5dd57f5aa1 100644 (file)
--- a/drivers/staging/iio/ring_sw.c
+++ b/drivers/staging/iio/ring_sw.c
@@ -392,13 +392,6 @@ static int iio_mark_update_needed_sw_rb(struct iio_ring_buffer *r)
        return 0;
 }
 
-static void iio_sw_rb_release(struct device *dev)
-{
-       struct iio_ring_buffer *r = to_iio_ring_buffer(dev);
-       iio_ring_access_release(&r->dev);
-       kfree(iio_to_sw_ring(r));
-}
-
 static IIO_RING_ENABLE_ATTR;
 static IIO_RING_BYTES_PER_DATUM_ATTR;
 static IIO_RING_LENGTH_ATTR;
@@ -413,16 +406,7 @@ static struct attribute *iio_ring_attributes[] = {
 
 static struct attribute_group iio_ring_attribute_group = {
        .attrs = iio_ring_attributes,
-};
-
-static const struct attribute_group *iio_ring_attribute_groups[] = {
-       &iio_ring_attribute_group,
-       NULL
-};
-
-static struct device_type iio_sw_ring_type = {
-       .release = iio_sw_rb_release,
-       .groups = iio_ring_attribute_groups,
+       .name = "buffer",
 };
 
 struct iio_ring_buffer *iio_sw_rb_allocate(struct iio_dev *indio_dev)
@@ -437,9 +421,7 @@ struct iio_ring_buffer *iio_sw_rb_allocate(struct iio_dev *indio_dev)
        buf = &ring->buf;
        iio_ring_buffer_init(buf, indio_dev);
        __iio_init_sw_ring_buffer(ring);
-       buf->dev.type = &iio_sw_ring_type;
-       buf->dev.parent = &indio_dev->dev;
-       dev_set_drvdata(&buf->dev, (void *)buf);
+       buf->attrs = &iio_ring_attribute_group;
 
        return buf;
 }
@@ -447,8 +429,7 @@ EXPORT_SYMBOL(iio_sw_rb_allocate);
 
 void iio_sw_rb_free(struct iio_ring_buffer *r)
 {
-       if (r)
-               iio_put_ring_buffer(r);
+       kfree(iio_to_sw_ring(r));
 }
 EXPORT_SYMBOL(iio_sw_rb_free);