Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1aa04278 authored by Jonathan Cameron's avatar Jonathan Cameron Committed by Greg Kroah-Hartman
Browse files

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: default avatarJonathan Cameron <jic23@cam.ac.uk>
Acked-by: default avatarMichael Hennerich <michael.hennerich@analog.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 6356463c

drivers/staging/iio/Documentation/generic_buffer.c

+6 −6
Original line number Diff line number Diff line
@@ -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;

drivers/staging/iio/Documentation/iio_utils.h

+1 −1
Original line number Diff line number Diff line
@@ -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/";

drivers/staging/iio/accel/adis16201_core.c

+3 −3
Original line number Diff line number Diff line
@@ -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);

drivers/staging/iio/accel/adis16203_core.c

+3 −3
Original line number Diff line number Diff line
@@ -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);

drivers/staging/iio/accel/adis16204_core.c

+3 −3
Original line number Diff line number Diff line
@@ -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);