Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

IIO: Move core headers to include/linux/iio

Step 1 in moving the IIO core out of staging.

Signed-off-by: Jonathan Cameron <jic23@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Jonathan Cameron and committed by
Greg Kroah-Hartman
06458e27 68284a12

+286 -287
+1 -1
drivers/staging/iio/Documentation/iio_event_monitor.c
··· 27 27 #include <fcntl.h> 28 28 #include <sys/ioctl.h> 29 29 #include "iio_utils.h" 30 - #include "../events.h" 30 + #include <linux/iio/events.h> 31 31 32 32 static const char * const iio_chan_type_name_spec[] = { 33 33 [IIO_VOLTAGE] = "voltage",
+3 -3
drivers/staging/iio/accel/adis16201_core.c
··· 15 15 #include <linux/sysfs.h> 16 16 #include <linux/module.h> 17 17 18 - #include "../iio.h" 19 - #include "../sysfs.h" 20 - #include "../buffer.h" 18 + #include <linux/iio/iio.h> 19 + #include <linux/iio/sysfs.h> 20 + #include <linux/iio/buffer.h> 21 21 22 22 #include "adis16201.h" 23 23
+2 -2
drivers/staging/iio/accel/adis16201_ring.c
··· 5 5 #include <linux/spi/spi.h> 6 6 #include <linux/slab.h> 7 7 8 - #include "../iio.h" 8 + #include <linux/iio/iio.h> 9 9 #include "../ring_sw.h" 10 - #include "../trigger_consumer.h" 10 + #include <linux/iio/trigger_consumer.h> 11 11 #include "adis16201.h" 12 12 13 13
+2 -2
drivers/staging/iio/accel/adis16201_trigger.c
··· 3 3 #include <linux/spi/spi.h> 4 4 #include <linux/export.h> 5 5 6 - #include "../iio.h" 7 - #include "../trigger.h" 6 + #include <linux/iio/iio.h> 7 + #include <linux/iio/trigger.h> 8 8 #include "adis16201.h" 9 9 10 10 /**
+3 -3
drivers/staging/iio/accel/adis16203_core.c
··· 15 15 #include <linux/sysfs.h> 16 16 #include <linux/module.h> 17 17 18 - #include "../iio.h" 19 - #include "../sysfs.h" 20 - #include "../buffer.h" 18 + #include <linux/iio/iio.h> 19 + #include <linux/iio/sysfs.h> 20 + #include <linux/iio/buffer.h> 21 21 22 22 #include "adis16203.h" 23 23
+2 -2
drivers/staging/iio/accel/adis16203_ring.c
··· 5 5 #include <linux/spi/spi.h> 6 6 #include <linux/slab.h> 7 7 8 - #include "../iio.h" 8 + #include <linux/iio/iio.h> 9 9 #include "../ring_sw.h" 10 - #include "../trigger_consumer.h" 10 + #include <linux/iio/trigger_consumer.h> 11 11 #include "adis16203.h" 12 12 13 13 /**
+2 -2
drivers/staging/iio/accel/adis16203_trigger.c
··· 3 3 #include <linux/spi/spi.h> 4 4 #include <linux/export.h> 5 5 6 - #include "../iio.h" 7 - #include "../trigger.h" 6 + #include <linux/iio/iio.h> 7 + #include <linux/iio/trigger.h> 8 8 #include "adis16203.h" 9 9 10 10 /**
+3 -3
drivers/staging/iio/accel/adis16204_core.c
··· 18 18 #include <linux/list.h> 19 19 #include <linux/module.h> 20 20 21 - #include "../iio.h" 22 - #include "../sysfs.h" 23 - #include "../buffer.h" 21 + #include <linux/iio/iio.h> 22 + #include <linux/iio/sysfs.h> 23 + #include <linux/iio/buffer.h> 24 24 25 25 #include "adis16204.h" 26 26
+2 -2
drivers/staging/iio/accel/adis16204_ring.c
··· 5 5 #include <linux/spi/spi.h> 6 6 #include <linux/slab.h> 7 7 8 - #include "../iio.h" 8 + #include <linux/iio/iio.h> 9 9 #include "../ring_sw.h" 10 - #include "../trigger_consumer.h" 10 + #include <linux/iio/trigger_consumer.h> 11 11 #include "adis16204.h" 12 12 13 13 /**
+2 -2
drivers/staging/iio/accel/adis16204_trigger.c
··· 3 3 #include <linux/spi/spi.h> 4 4 #include <linux/export.h> 5 5 6 - #include "../iio.h" 7 - #include "../trigger.h" 6 + #include <linux/iio/iio.h> 7 + #include <linux/iio/trigger.h> 8 8 #include "adis16204.h" 9 9 10 10 /**
+3 -3
drivers/staging/iio/accel/adis16209_core.c
··· 16 16 #include <linux/list.h> 17 17 #include <linux/module.h> 18 18 19 - #include "../iio.h" 20 - #include "../sysfs.h" 21 - #include "../buffer.h" 19 + #include <linux/iio/iio.h> 20 + #include <linux/iio/sysfs.h> 21 + #include <linux/iio/buffer.h> 22 22 23 23 #include "adis16209.h" 24 24
+2 -2
drivers/staging/iio/accel/adis16209_ring.c
··· 5 5 #include <linux/spi/spi.h> 6 6 #include <linux/slab.h> 7 7 8 - #include "../iio.h" 8 + #include <linux/iio/iio.h> 9 9 #include "../ring_sw.h" 10 - #include "../trigger_consumer.h" 10 + #include <linux/iio/trigger_consumer.h> 11 11 #include "adis16209.h" 12 12 13 13 /**
+2 -2
drivers/staging/iio/accel/adis16209_trigger.c
··· 3 3 #include <linux/spi/spi.h> 4 4 #include <linux/export.h> 5 5 6 - #include "../iio.h" 7 - #include "../trigger.h" 6 + #include <linux/iio/iio.h> 7 + #include <linux/iio/trigger.h> 8 8 #include "adis16209.h" 9 9 10 10 /**
+2 -2
drivers/staging/iio/accel/adis16220_core.c
··· 15 15 #include <linux/sysfs.h> 16 16 #include <linux/module.h> 17 17 18 - #include "../iio.h" 19 - #include "../sysfs.h" 18 + #include <linux/iio/iio.h> 19 + #include <linux/iio/sysfs.h> 20 20 21 21 #include "adis16220.h" 22 22
+3 -3
drivers/staging/iio/accel/adis16240_core.c
··· 19 19 #include <linux/list.h> 20 20 #include <linux/module.h> 21 21 22 - #include "../iio.h" 23 - #include "../sysfs.h" 24 - #include "../buffer.h" 22 + #include <linux/iio/iio.h> 23 + #include <linux/iio/sysfs.h> 24 + #include <linux/iio/buffer.h> 25 25 26 26 #include "adis16240.h" 27 27
+2 -2
drivers/staging/iio/accel/adis16240_ring.c
··· 5 5 #include <linux/spi/spi.h> 6 6 #include <linux/slab.h> 7 7 8 - #include "../iio.h" 8 + #include <linux/iio/iio.h> 9 9 #include "../ring_sw.h" 10 - #include "../trigger_consumer.h" 10 + #include <linux/iio/trigger_consumer.h> 11 11 #include "adis16240.h" 12 12 13 13 /**
+2 -2
drivers/staging/iio/accel/adis16240_trigger.c
··· 3 3 #include <linux/spi/spi.h> 4 4 #include <linux/export.h> 5 5 6 - #include "../iio.h" 7 - #include "../trigger.h" 6 + #include <linux/iio/iio.h> 7 + #include <linux/iio/trigger.h> 8 8 #include "adis16240.h" 9 9 10 10 /**
+2 -2
drivers/staging/iio/accel/kxsd9.c
··· 23 23 #include <linux/slab.h> 24 24 #include <linux/module.h> 25 25 26 - #include "../iio.h" 27 - #include "../sysfs.h" 26 + #include <linux/iio/iio.h> 27 + #include <linux/iio/sysfs.h> 28 28 29 29 #define KXSD9_REG_X 0x00 30 30 #define KXSD9_REG_Y 0x02
+4 -4
drivers/staging/iio/accel/lis3l02dq_core.c
··· 23 23 #include <linux/sysfs.h> 24 24 #include <linux/module.h> 25 25 26 - #include "../iio.h" 27 - #include "../sysfs.h" 28 - #include "../events.h" 29 - #include "../buffer.h" 26 + #include <linux/iio/iio.h> 27 + #include <linux/iio/sysfs.h> 28 + #include <linux/iio/events.h> 29 + #include <linux/iio/buffer.h> 30 30 31 31 #include "lis3l02dq.h" 32 32
+4 -4
drivers/staging/iio/accel/lis3l02dq_ring.c
··· 6 6 #include <linux/slab.h> 7 7 #include <linux/export.h> 8 8 9 - #include "../iio.h" 9 + #include <linux/iio/iio.h> 10 10 #include "../ring_sw.h" 11 - #include "../kfifo_buf.h" 12 - #include "../trigger.h" 13 - #include "../trigger_consumer.h" 11 + #include <linux/iio/kfifo_buf.h> 12 + #include <linux/iio/trigger.h> 13 + #include <linux/iio/trigger_consumer.h> 14 14 #include "lis3l02dq.h" 15 15 16 16 /**
+4 -4
drivers/staging/iio/accel/sca3000_core.c
··· 18 18 #include <linux/spi/spi.h> 19 19 #include <linux/sysfs.h> 20 20 #include <linux/module.h> 21 - #include "../iio.h" 22 - #include "../sysfs.h" 23 - #include "../events.h" 24 - #include "../buffer.h" 21 + #include <linux/iio/iio.h> 22 + #include <linux/iio/sysfs.h> 23 + #include <linux/iio/events.h> 24 + #include <linux/iio/buffer.h> 25 25 26 26 #include "sca3000.h" 27 27
+3 -3
drivers/staging/iio/accel/sca3000_ring.c
··· 18 18 #include <linux/sched.h> 19 19 #include <linux/poll.h> 20 20 21 - #include "../iio.h" 22 - #include "../sysfs.h" 23 - #include "../buffer.h" 21 + #include <linux/iio/iio.h> 22 + #include <linux/iio/sysfs.h> 23 + #include <linux/iio/buffer.h> 24 24 #include "../ring_hw.h" 25 25 #include "sca3000.h" 26 26
+5 -5
drivers/staging/iio/adc/ad7192.c
··· 17 17 #include <linux/sched.h> 18 18 #include <linux/delay.h> 19 19 20 - #include "../iio.h" 21 - #include "../sysfs.h" 22 - #include "../buffer.h" 20 + #include <linux/iio/iio.h> 21 + #include <linux/iio/sysfs.h> 22 + #include <linux/iio/buffer.h> 23 23 #include "../ring_sw.h" 24 - #include "../trigger.h" 25 - #include "../trigger_consumer.h" 24 + #include <linux/iio/trigger.h> 25 + #include <linux/iio/trigger_consumer.h> 26 26 27 27 #include "ad7192.h" 28 28
+3 -3
drivers/staging/iio/adc/ad7280a.c
··· 16 16 #include <linux/interrupt.h> 17 17 #include <linux/module.h> 18 18 19 - #include "../iio.h" 20 - #include "../sysfs.h" 21 - #include "../events.h" 19 + #include <linux/iio/iio.h> 20 + #include <linux/iio/sysfs.h> 21 + #include <linux/iio/events.h> 22 22 23 23 #include "ad7280a.h" 24 24
+3 -3
drivers/staging/iio/adc/ad7291.c
··· 17 17 #include <linux/regulator/consumer.h> 18 18 #include <linux/err.h> 19 19 20 - #include "../iio.h" 21 - #include "../sysfs.h" 22 - #include "../events.h" 20 + #include <linux/iio/iio.h> 21 + #include <linux/iio/sysfs.h> 22 + #include <linux/iio/events.h> 23 23 24 24 /* 25 25 * Simplified handling
+3 -3
drivers/staging/iio/adc/ad7298_core.c
··· 16 16 #include <linux/delay.h> 17 17 #include <linux/module.h> 18 18 19 - #include "../iio.h" 20 - #include "../sysfs.h" 21 - #include "../buffer.h" 19 + #include <linux/iio/iio.h> 20 + #include <linux/iio/sysfs.h> 21 + #include <linux/iio/buffer.h> 22 22 23 23 #include "ad7298.h" 24 24
+3 -3
drivers/staging/iio/adc/ad7298_ring.c
··· 11 11 #include <linux/slab.h> 12 12 #include <linux/spi/spi.h> 13 13 14 - #include "../iio.h" 15 - #include "../buffer.h" 14 + #include <linux/iio/iio.h> 15 + #include <linux/iio/buffer.h> 16 16 #include "../ring_sw.h" 17 - #include "../trigger_consumer.h" 17 + #include <linux/iio/trigger_consumer.h> 18 18 19 19 #include "ad7298.h" 20 20
+3 -3
drivers/staging/iio/adc/ad7476_core.c
··· 15 15 #include <linux/err.h> 16 16 #include <linux/module.h> 17 17 18 - #include "../iio.h" 19 - #include "../sysfs.h" 20 - #include "../buffer.h" 18 + #include <linux/iio/iio.h> 19 + #include <linux/iio/sysfs.h> 20 + #include <linux/iio/buffer.h> 21 21 22 22 #include "ad7476.h" 23 23
+3 -3
drivers/staging/iio/adc/ad7476_ring.c
··· 13 13 #include <linux/slab.h> 14 14 #include <linux/spi/spi.h> 15 15 16 - #include "../iio.h" 17 - #include "../buffer.h" 16 + #include <linux/iio/iio.h> 17 + #include <linux/iio/buffer.h> 18 18 #include "../ring_sw.h" 19 - #include "../trigger_consumer.h" 19 + #include <linux/iio/trigger_consumer.h> 20 20 21 21 #include "ad7476.h" 22 22
+3 -3
drivers/staging/iio/adc/ad7606_core.c
··· 18 18 #include <linux/sched.h> 19 19 #include <linux/module.h> 20 20 21 - #include "../iio.h" 22 - #include "../sysfs.h" 23 - #include "../buffer.h" 21 + #include <linux/iio/iio.h> 22 + #include <linux/iio/sysfs.h> 23 + #include <linux/iio/buffer.h> 24 24 25 25 #include "ad7606.h" 26 26
+1 -1
drivers/staging/iio/adc/ad7606_par.c
··· 12 12 #include <linux/err.h> 13 13 #include <linux/io.h> 14 14 15 - #include "../iio.h" 15 + #include <linux/iio/iio.h> 16 16 #include "ad7606.h" 17 17 18 18 static int ad7606_par16_read_block(struct device *dev,
+3 -3
drivers/staging/iio/adc/ad7606_ring.c
··· 11 11 #include <linux/kernel.h> 12 12 #include <linux/slab.h> 13 13 14 - #include "../iio.h" 15 - #include "../buffer.h" 14 + #include <linux/iio/iio.h> 15 + #include <linux/iio/buffer.h> 16 16 #include "../ring_sw.h" 17 - #include "../trigger_consumer.h" 17 + #include <linux/iio/trigger_consumer.h> 18 18 19 19 #include "ad7606.h" 20 20
+1 -1
drivers/staging/iio/adc/ad7606_spi.c
··· 11 11 #include <linux/types.h> 12 12 #include <linux/err.h> 13 13 14 - #include "../iio.h" 14 + #include <linux/iio/iio.h> 15 15 #include "ad7606.h" 16 16 17 17 #define MAX_SPI_FREQ_HZ 23500000 /* VDRIVE above 4.75 V */
+2 -2
drivers/staging/iio/adc/ad7780.c
··· 18 18 #include <linux/gpio.h> 19 19 #include <linux/module.h> 20 20 21 - #include "../iio.h" 22 - #include "../sysfs.h" 21 + #include <linux/iio/iio.h> 22 + #include <linux/iio/sysfs.h> 23 23 24 24 #include "ad7780.h" 25 25
+5 -5
drivers/staging/iio/adc/ad7793.c
··· 18 18 #include <linux/delay.h> 19 19 #include <linux/module.h> 20 20 21 - #include "../iio.h" 22 - #include "../sysfs.h" 23 - #include "../buffer.h" 21 + #include <linux/iio/iio.h> 22 + #include <linux/iio/sysfs.h> 23 + #include <linux/iio/buffer.h> 24 24 #include "../ring_sw.h" 25 - #include "../trigger.h" 26 - #include "../trigger_consumer.h" 25 + #include <linux/iio/trigger.h> 26 + #include <linux/iio/trigger_consumer.h> 27 27 28 28 #include "ad7793.h" 29 29
+3 -3
drivers/staging/iio/adc/ad7816.c
··· 16 16 #include <linux/spi/spi.h> 17 17 #include <linux/module.h> 18 18 19 - #include "../iio.h" 20 - #include "../sysfs.h" 21 - #include "../events.h" 19 + #include <linux/iio/iio.h> 20 + #include <linux/iio/sysfs.h> 21 + #include <linux/iio/events.h> 22 22 23 23 /* 24 24 * AD7816 config masks
+3 -3
drivers/staging/iio/adc/ad7887_core.c
··· 15 15 #include <linux/err.h> 16 16 #include <linux/module.h> 17 17 18 - #include "../iio.h" 19 - #include "../sysfs.h" 20 - #include "../buffer.h" 18 + #include <linux/iio/iio.h> 19 + #include <linux/iio/sysfs.h> 20 + #include <linux/iio/buffer.h> 21 21 22 22 23 23 #include "ad7887.h"
+3 -3
drivers/staging/iio/adc/ad7887_ring.c
··· 12 12 #include <linux/slab.h> 13 13 #include <linux/spi/spi.h> 14 14 15 - #include "../iio.h" 16 - #include "../buffer.h" 15 + #include <linux/iio/iio.h> 16 + #include <linux/iio/buffer.h> 17 17 #include "../ring_sw.h" 18 - #include "../trigger_consumer.h" 18 + #include <linux/iio/trigger_consumer.h> 19 19 20 20 #include "ad7887.h" 21 21
+4 -4
drivers/staging/iio/adc/ad799x_core.c
··· 33 33 #include <linux/err.h> 34 34 #include <linux/module.h> 35 35 36 - #include "../iio.h" 37 - #include "../sysfs.h" 38 - #include "../events.h" 39 - #include "../buffer.h" 36 + #include <linux/iio/iio.h> 37 + #include <linux/iio/sysfs.h> 38 + #include <linux/iio/events.h> 39 + #include <linux/iio/buffer.h> 40 40 41 41 #include "ad799x.h" 42 42
+3 -3
drivers/staging/iio/adc/ad799x_ring.c
··· 16 16 #include <linux/i2c.h> 17 17 #include <linux/bitops.h> 18 18 19 - #include "../iio.h" 20 - #include "../buffer.h" 19 + #include <linux/iio/iio.h> 20 + #include <linux/iio/buffer.h> 21 21 #include "../ring_sw.h" 22 - #include "../trigger_consumer.h" 22 + #include <linux/iio/trigger_consumer.h> 23 23 24 24 #include "ad799x.h" 25 25
+3 -3
drivers/staging/iio/adc/adt7310.c
··· 15 15 #include <linux/spi/spi.h> 16 16 #include <linux/module.h> 17 17 18 - #include "../iio.h" 19 - #include "../sysfs.h" 20 - #include "../events.h" 18 + #include <linux/iio/iio.h> 19 + #include <linux/iio/sysfs.h> 20 + #include <linux/iio/events.h> 21 21 /* 22 22 * ADT7310 registers definition 23 23 */
+3 -3
drivers/staging/iio/adc/adt7410.c
··· 15 15 #include <linux/i2c.h> 16 16 #include <linux/module.h> 17 17 18 - #include "../iio.h" 19 - #include "../sysfs.h" 20 - #include "../events.h" 18 + #include <linux/iio/iio.h> 19 + #include <linux/iio/sysfs.h> 20 + #include <linux/iio/events.h> 21 21 22 22 /* 23 23 * ADT7410 registers definition
+2 -2
drivers/staging/iio/adc/lpc32xx_adc.c
··· 32 32 #include <linux/completion.h> 33 33 #include <linux/of.h> 34 34 35 - #include "../iio.h" 36 - #include "../sysfs.h" 35 + #include <linux/iio/iio.h> 36 + #include <linux/iio/sysfs.h> 37 37 38 38 /* 39 39 * LPC32XX registers definitions
+5 -5
drivers/staging/iio/adc/max1363_core.c
··· 32 32 #include <linux/err.h> 33 33 #include <linux/module.h> 34 34 35 - #include "../iio.h" 36 - #include "../sysfs.h" 37 - #include "../events.h" 38 - #include "../buffer.h" 39 - #include "../driver.h" 35 + #include <linux/iio/iio.h> 36 + #include <linux/iio/sysfs.h> 37 + #include <linux/iio/events.h> 38 + #include <linux/iio/buffer.h> 39 + #include <linux/iio/driver.h> 40 40 41 41 #include "max1363.h" 42 42
+3 -3
drivers/staging/iio/adc/max1363_ring.c
··· 14 14 #include <linux/i2c.h> 15 15 #include <linux/bitops.h> 16 16 17 - #include "../iio.h" 18 - #include "../buffer.h" 17 + #include <linux/iio/iio.h> 18 + #include <linux/iio/buffer.h> 19 19 #include "../ring_sw.h" 20 - #include "../trigger_consumer.h" 20 + #include <linux/iio/trigger_consumer.h> 21 21 22 22 #include "max1363.h" 23 23
+2 -2
drivers/staging/iio/adc/spear_adc.c
··· 19 19 #include <linux/of.h> 20 20 #include <linux/of_address.h> 21 21 22 - #include "../iio.h" 23 - #include "../sysfs.h" 22 + #include <linux/iio/iio.h> 23 + #include <linux/iio/sysfs.h> 24 24 25 25 /* 26 26 * SPEAR registers definitions
+3 -3
drivers/staging/iio/addac/adt7316.c
··· 19 19 #include <linux/rtc.h> 20 20 #include <linux/module.h> 21 21 22 - #include "../iio.h" 23 - #include "../events.h" 24 - #include "../sysfs.h" 22 + #include <linux/iio/iio.h> 23 + #include <linux/iio/events.h> 24 + #include <linux/iio/sysfs.h> 25 25 #include "adt7316.h" 26 26 27 27 /*
+1 -1
drivers/staging/iio/buffer.h include/linux/iio/buffer.h
··· 10 10 #ifndef _IIO_BUFFER_GENERIC_H_ 11 11 #define _IIO_BUFFER_GENERIC_H_ 12 12 #include <linux/sysfs.h> 13 - #include "iio.h" 13 + #include <linux/iio/iio.h> 14 14 15 15 #ifdef CONFIG_IIO_BUFFER 16 16
+3 -3
drivers/staging/iio/cdc/ad7150.c
··· 13 13 #include <linux/i2c.h> 14 14 #include <linux/module.h> 15 15 16 - #include "../iio.h" 17 - #include "../sysfs.h" 18 - #include "../events.h" 16 + #include <linux/iio/iio.h> 17 + #include <linux/iio/sysfs.h> 18 + #include <linux/iio/events.h> 19 19 /* 20 20 * AD7150 registers definition 21 21 */
+2 -2
drivers/staging/iio/cdc/ad7152.c
··· 15 15 #include <linux/module.h> 16 16 #include <linux/delay.h> 17 17 18 - #include "../iio.h" 19 - #include "../sysfs.h" 18 + #include <linux/iio/iio.h> 19 + #include <linux/iio/sysfs.h> 20 20 21 21 /* 22 22 * TODO: Check compliance of calibbias with abi (units)
+2 -2
drivers/staging/iio/cdc/ad7746.c
··· 16 16 #include <linux/module.h> 17 17 #include <linux/stat.h> 18 18 19 - #include "../iio.h" 20 - #include "../sysfs.h" 19 + #include <linux/iio/iio.h> 20 + #include <linux/iio/sysfs.h> 21 21 22 22 #include "ad7746.h" 23 23
+1 -1
drivers/staging/iio/consumer.h include/linux/iio/consumer.h
··· 9 9 */ 10 10 #ifndef _IIO_INKERN_CONSUMER_H_ 11 11 #define _IIO_INKERN_CONSUMER_H 12 - #include "types.h" 12 + #include <linux/iio/types.h> 13 13 14 14 struct iio_dev; 15 15 struct iio_chan_spec;
+2 -2
drivers/staging/iio/dac/ad5064.c
··· 16 16 #include <linux/sysfs.h> 17 17 #include <linux/regulator/consumer.h> 18 18 19 - #include "../iio.h" 20 - #include "../sysfs.h" 19 + #include <linux/iio/iio.h> 20 + #include <linux/iio/sysfs.h> 21 21 #include "dac.h" 22 22 23 23 #define AD5064_MAX_DAC_CHANNELS 8
+2 -2
drivers/staging/iio/dac/ad5360.c
··· 16 16 #include <linux/sysfs.h> 17 17 #include <linux/regulator/consumer.h> 18 18 19 - #include "../iio.h" 20 - #include "../sysfs.h" 19 + #include <linux/iio/iio.h> 20 + #include <linux/iio/sysfs.h> 21 21 #include "dac.h" 22 22 23 23 #define AD5360_CMD(x) ((x) << 22)
+2 -2
drivers/staging/iio/dac/ad5380.c
··· 18 18 #include <linux/regmap.h> 19 19 #include <linux/regulator/consumer.h> 20 20 21 - #include "../iio.h" 22 - #include "../sysfs.h" 21 + #include <linux/iio/iio.h> 22 + #include <linux/iio/sysfs.h> 23 23 #include "dac.h" 24 24 25 25
+3 -3
drivers/staging/iio/dac/ad5421.c
··· 16 16 #include <linux/slab.h> 17 17 #include <linux/sysfs.h> 18 18 19 - #include "../iio.h" 20 - #include "../sysfs.h" 21 - #include "../events.h" 19 + #include <linux/iio/iio.h> 20 + #include <linux/iio/sysfs.h> 21 + #include <linux/iio/events.h> 22 22 #include "dac.h" 23 23 #include "ad5421.h" 24 24
+2 -2
drivers/staging/iio/dac/ad5446.c
··· 18 18 #include <linux/err.h> 19 19 #include <linux/module.h> 20 20 21 - #include "../iio.h" 22 - #include "../sysfs.h" 21 + #include <linux/iio/iio.h> 22 + #include <linux/iio/sysfs.h> 23 23 #include "dac.h" 24 24 25 25 #include "ad5446.h"
+3 -3
drivers/staging/iio/dac/ad5504.c
··· 16 16 #include <linux/regulator/consumer.h> 17 17 #include <linux/module.h> 18 18 19 - #include "../iio.h" 20 - #include "../sysfs.h" 21 - #include "../events.h" 19 + #include <linux/iio/iio.h> 20 + #include <linux/iio/sysfs.h> 21 + #include <linux/iio/events.h> 22 22 #include "dac.h" 23 23 #include "ad5504.h" 24 24
+2 -2
drivers/staging/iio/dac/ad5624r_spi.c
··· 16 16 #include <linux/regulator/consumer.h> 17 17 #include <linux/module.h> 18 18 19 - #include "../iio.h" 20 - #include "../sysfs.h" 19 + #include <linux/iio/iio.h> 20 + #include <linux/iio/sysfs.h> 21 21 #include "dac.h" 22 22 #include "ad5624r.h" 23 23
+2 -2
drivers/staging/iio/dac/ad5686.c
··· 16 16 #include <linux/sysfs.h> 17 17 #include <linux/regulator/consumer.h> 18 18 19 - #include "../iio.h" 20 - #include "../sysfs.h" 19 + #include <linux/iio/iio.h> 20 + #include <linux/iio/sysfs.h> 21 21 #include "dac.h" 22 22 23 23 #define AD5686_DAC_CHANNELS 4
+2 -2
drivers/staging/iio/dac/ad5764.c
··· 16 16 #include <linux/sysfs.h> 17 17 #include <linux/regulator/consumer.h> 18 18 19 - #include "../iio.h" 20 - #include "../sysfs.h" 19 + #include <linux/iio/iio.h> 20 + #include <linux/iio/sysfs.h> 21 21 #include "dac.h" 22 22 23 23 #define AD5764_REG_SF_NOP 0x0
+2 -2
drivers/staging/iio/dac/ad5791.c
··· 17 17 #include <linux/regulator/consumer.h> 18 18 #include <linux/module.h> 19 19 20 - #include "../iio.h" 21 - #include "../sysfs.h" 20 + #include <linux/iio/iio.h> 21 + #include <linux/iio/sysfs.h> 22 22 #include "dac.h" 23 23 #include "ad5791.h" 24 24
+2 -2
drivers/staging/iio/dac/max517.c
··· 25 25 #include <linux/i2c.h> 26 26 #include <linux/err.h> 27 27 28 - #include "../iio.h" 29 - #include "../sysfs.h" 28 + #include <linux/iio/iio.h> 29 + #include <linux/iio/sysfs.h> 30 30 #include "dac.h" 31 31 32 32 #include "max517.h"
+2 -2
drivers/staging/iio/dds/ad5930.c
··· 16 16 #include <linux/sysfs.h> 17 17 #include <linux/module.h> 18 18 19 - #include "../iio.h" 20 - #include "../sysfs.h" 19 + #include <linux/iio/iio.h> 20 + #include <linux/iio/sysfs.h> 21 21 22 22 #define DRV_NAME "ad5930" 23 23
+2 -2
drivers/staging/iio/dds/ad9832.c
··· 16 16 #include <linux/module.h> 17 17 #include <asm/div64.h> 18 18 19 - #include "../iio.h" 20 - #include "../sysfs.h" 19 + #include <linux/iio/iio.h> 20 + #include <linux/iio/sysfs.h> 21 21 #include "dds.h" 22 22 23 23 #include "ad9832.h"
+2 -2
drivers/staging/iio/dds/ad9834.c
··· 19 19 #include <linux/module.h> 20 20 #include <asm/div64.h> 21 21 22 - #include "../iio.h" 23 - #include "../sysfs.h" 22 + #include <linux/iio/iio.h> 23 + #include <linux/iio/sysfs.h> 24 24 #include "dds.h" 25 25 26 26 #include "ad9834.h"
+2 -2
drivers/staging/iio/dds/ad9850.c
··· 16 16 #include <linux/sysfs.h> 17 17 #include <linux/module.h> 18 18 19 - #include "../iio.h" 20 - #include "../sysfs.h" 19 + #include <linux/iio/iio.h> 20 + #include <linux/iio/sysfs.h> 21 21 22 22 #define DRV_NAME "ad9850" 23 23
+2 -2
drivers/staging/iio/dds/ad9852.c
··· 16 16 #include <linux/sysfs.h> 17 17 #include <linux/module.h> 18 18 19 - #include "../iio.h" 20 - #include "../sysfs.h" 19 + #include <linux/iio/iio.h> 20 + #include <linux/iio/sysfs.h> 21 21 22 22 #define DRV_NAME "ad9852" 23 23
+2 -2
drivers/staging/iio/dds/ad9910.c
··· 16 16 #include <linux/sysfs.h> 17 17 #include <linux/module.h> 18 18 19 - #include "../iio.h" 20 - #include "../sysfs.h" 19 + #include <linux/iio/iio.h> 20 + #include <linux/iio/sysfs.h> 21 21 22 22 #define DRV_NAME "ad9910" 23 23
+2 -2
drivers/staging/iio/dds/ad9951.c
··· 16 16 #include <linux/sysfs.h> 17 17 #include <linux/module.h> 18 18 19 - #include "../iio.h" 20 - #include "../sysfs.h" 19 + #include <linux/iio/iio.h> 20 + #include <linux/iio/sysfs.h> 21 21 22 22 #define DRV_NAME "ad9951" 23 23
drivers/staging/iio/driver.h include/linux/iio/driver.h
+1 -1
drivers/staging/iio/events.h include/linux/iio/events.h
··· 11 11 12 12 #include <linux/ioctl.h> 13 13 #include <linux/types.h> 14 - #include "types.h" 14 + #include <linux/iio/types.h> 15 15 16 16 /** 17 17 * struct iio_event_data - The actual event being pushed to userspace
+2 -2
drivers/staging/iio/gyro/adis16060_core.c
··· 15 15 #include <linux/slab.h> 16 16 #include <linux/sysfs.h> 17 17 18 - #include "../iio.h" 19 - #include "../sysfs.h" 18 + #include <linux/iio/iio.h> 19 + #include <linux/iio/sysfs.h> 20 20 21 21 #define ADIS16060_GYRO 0x20 /* Measure Angular Rate (Gyro) */ 22 22 #define ADIS16060_TEMP_OUT 0x10 /* Measure Temperature */
+2 -2
drivers/staging/iio/gyro/adis16080_core.c
··· 14 14 #include <linux/sysfs.h> 15 15 #include <linux/module.h> 16 16 17 - #include "../iio.h" 18 - #include "../sysfs.h" 17 + #include <linux/iio/iio.h> 18 + #include <linux/iio/sysfs.h> 19 19 20 20 #define ADIS16080_DIN_GYRO (0 << 10) /* Gyroscope output */ 21 21 #define ADIS16080_DIN_TEMP (1 << 10) /* Temperature output */
+2 -2
drivers/staging/iio/gyro/adis16130_core.c
··· 16 16 #include <linux/list.h> 17 17 #include <linux/module.h> 18 18 19 - #include "../iio.h" 20 - #include "../sysfs.h" 19 + #include <linux/iio/iio.h> 20 + #include <linux/iio/sysfs.h> 21 21 22 22 #define ADIS16130_CON 0x0 23 23 #define ADIS16130_CON_RD (1 << 6)
+3 -3
drivers/staging/iio/gyro/adis16260_core.c
··· 18 18 #include <linux/list.h> 19 19 #include <linux/module.h> 20 20 21 - #include "../iio.h" 22 - #include "../sysfs.h" 23 - #include "../buffer.h" 21 + #include <linux/iio/iio.h> 22 + #include <linux/iio/sysfs.h> 23 + #include <linux/iio/buffer.h> 24 24 25 25 #include "adis16260.h" 26 26
+2 -2
drivers/staging/iio/gyro/adis16260_ring.c
··· 5 5 #include <linux/spi/spi.h> 6 6 #include <linux/slab.h> 7 7 8 - #include "../iio.h" 8 + #include <linux/iio/iio.h> 9 9 #include "../ring_sw.h" 10 - #include "../trigger_consumer.h" 10 + #include <linux/iio/trigger_consumer.h> 11 11 #include "adis16260.h" 12 12 13 13 /**
+2 -2
drivers/staging/iio/gyro/adis16260_trigger.c
··· 3 3 #include <linux/spi/spi.h> 4 4 #include <linux/export.h> 5 5 6 - #include "../iio.h" 7 - #include "../trigger.h" 6 + #include <linux/iio/iio.h> 7 + #include <linux/iio/trigger.h> 8 8 #include "adis16260.h" 9 9 10 10 /**
+2 -2
drivers/staging/iio/gyro/adxrs450_core.c
··· 18 18 #include <linux/list.h> 19 19 #include <linux/module.h> 20 20 21 - #include "../iio.h" 22 - #include "../sysfs.h" 21 + #include <linux/iio/iio.h> 22 + #include <linux/iio/sysfs.h> 23 23 24 24 #include "adxrs450.h" 25 25
+1 -1
drivers/staging/iio/iio.h include/linux/iio/iio.h
··· 12 12 13 13 #include <linux/device.h> 14 14 #include <linux/cdev.h> 15 - #include "types.h" 15 + #include <linux/iio/types.h> 16 16 /* IIO TODO LIST */ 17 17 /* 18 18 * Provide means of adjusting timer accuracy.
+2 -2
drivers/staging/iio/iio_dummy_evgen.c
··· 22 22 #include <linux/sysfs.h> 23 23 24 24 #include "iio_dummy_evgen.h" 25 - #include "iio.h" 26 - #include "sysfs.h" 25 + #include <linux/iio/iio.h> 26 + #include <linux/iio/sysfs.h> 27 27 28 28 /* Fiddly bit of faking and irq without hardware */ 29 29 #define IIO_EVENTGEN_NO 10
+2 -2
drivers/staging/iio/iio_hwmon.c
··· 14 14 #include <linux/platform_device.h> 15 15 #include <linux/hwmon.h> 16 16 #include <linux/hwmon-sysfs.h> 17 - #include "consumer.h" 18 - #include "types.h" 17 + #include <linux/iio/consumer.h> 18 + #include <linux/iio/types.h> 19 19 20 20 /** 21 21 * struct iio_hwmon_state - device instance state
+4 -4
drivers/staging/iio/iio_simple_dummy.c
··· 19 19 #include <linux/module.h> 20 20 #include <linux/moduleparam.h> 21 21 22 - #include "iio.h" 23 - #include "sysfs.h" 24 - #include "events.h" 25 - #include "buffer.h" 22 + #include <linux/iio/iio.h> 23 + #include <linux/iio/sysfs.h> 24 + #include <linux/iio/events.h> 25 + #include <linux/iio/buffer.h> 26 26 #include "iio_simple_dummy.h" 27 27 28 28 /*
+3 -3
drivers/staging/iio/iio_simple_dummy_buffer.c
··· 18 18 #include <linux/irq.h> 19 19 #include <linux/bitmap.h> 20 20 21 - #include "iio.h" 22 - #include "trigger_consumer.h" 23 - #include "kfifo_buf.h" 21 + #include <linux/iio/iio.h> 22 + #include <linux/iio/trigger_consumer.h> 23 + #include <linux/iio/kfifo_buf.h> 24 24 25 25 #include "iio_simple_dummy.h" 26 26
+3 -3
drivers/staging/iio/iio_simple_dummy_events.c
··· 12 12 #include <linux/interrupt.h> 13 13 #include <linux/irq.h> 14 14 15 - #include "iio.h" 16 - #include "sysfs.h" 17 - #include "events.h" 15 + #include <linux/iio/iio.h> 16 + #include <linux/iio/sysfs.h> 17 + #include <linux/iio/events.h> 18 18 #include "iio_simple_dummy.h" 19 19 20 20 /* Evgen 'fakes' interrupt events for this example */
+3 -3
drivers/staging/iio/impedance-analyzer/ad5933.c
··· 19 19 #include <linux/module.h> 20 20 #include <asm/div64.h> 21 21 22 - #include "../iio.h" 23 - #include "../sysfs.h" 24 - #include "../buffer.h" 22 + #include <linux/iio/iio.h> 23 + #include <linux/iio/sysfs.h> 24 + #include <linux/iio/buffer.h> 25 25 #include "../ring_sw.h" 26 26 27 27 #include "ad5933.h"
+3 -3
drivers/staging/iio/imu/adis16400_core.c
··· 26 26 #include <linux/list.h> 27 27 #include <linux/module.h> 28 28 29 - #include "../iio.h" 30 - #include "../sysfs.h" 31 - #include "../buffer.h" 29 + #include <linux/iio/iio.h> 30 + #include <linux/iio/sysfs.h> 31 + #include <linux/iio/buffer.h> 32 32 #include "adis16400.h" 33 33 34 34 enum adis16400_chip_variant {
+2 -2
drivers/staging/iio/imu/adis16400_ring.c
··· 6 6 #include <linux/bitops.h> 7 7 #include <linux/export.h> 8 8 9 - #include "../iio.h" 9 + #include <linux/iio/iio.h> 10 10 #include "../ring_sw.h" 11 - #include "../trigger_consumer.h" 11 + #include <linux/iio/trigger_consumer.h> 12 12 #include "adis16400.h" 13 13 14 14 /**
+2 -2
drivers/staging/iio/imu/adis16400_trigger.c
··· 3 3 #include <linux/spi/spi.h> 4 4 #include <linux/export.h> 5 5 6 - #include "../iio.h" 7 - #include "../trigger.h" 6 + #include <linux/iio/iio.h> 7 + #include <linux/iio/trigger.h> 8 8 #include "adis16400.h" 9 9 10 10 /**
+3 -3
drivers/staging/iio/industrialio-buffer.c
··· 21 21 #include <linux/slab.h> 22 22 #include <linux/poll.h> 23 23 24 - #include "iio.h" 24 + #include <linux/iio/iio.h> 25 25 #include "iio_core.h" 26 - #include "sysfs.h" 27 - #include "buffer.h" 26 + #include <linux/iio/sysfs.h> 27 + #include <linux/iio/buffer.h> 28 28 29 29 static const char * const iio_endian_prefix[] = { 30 30 [IIO_BE] = "be",
+3 -3
drivers/staging/iio/industrialio-core.c
··· 23 23 #include <linux/slab.h> 24 24 #include <linux/anon_inodes.h> 25 25 #include <linux/debugfs.h> 26 - #include "iio.h" 26 + #include <linux/iio/iio.h> 27 27 #include "iio_core.h" 28 28 #include "iio_core_trigger.h" 29 - #include "sysfs.h" 30 - #include "events.h" 29 + #include <linux/iio/sysfs.h> 30 + #include <linux/iio/events.h> 31 31 32 32 /* IDA to assign each registered device a unique id*/ 33 33 static DEFINE_IDA(iio_ida);
+3 -3
drivers/staging/iio/industrialio-event.c
··· 20 20 #include <linux/slab.h> 21 21 #include <linux/uaccess.h> 22 22 #include <linux/wait.h> 23 - #include "iio.h" 23 + #include <linux/iio/iio.h> 24 24 #include "iio_core.h" 25 - #include "sysfs.h" 26 - #include "events.h" 25 + #include <linux/iio/sysfs.h> 26 + #include <linux/iio/events.h> 27 27 28 28 /** 29 29 * struct iio_event_interface - chrdev interface for an event line
+3 -3
drivers/staging/iio/industrialio-trigger.c
··· 15 15 #include <linux/list.h> 16 16 #include <linux/slab.h> 17 17 18 - #include "iio.h" 19 - #include "trigger.h" 18 + #include <linux/iio/iio.h> 19 + #include <linux/iio/trigger.h> 20 20 #include "iio_core.h" 21 21 #include "iio_core_trigger.h" 22 - #include "trigger_consumer.h" 22 + #include <linux/iio/trigger_consumer.h> 23 23 24 24 /* RFC - Question of approach 25 25 * Make the common case (single sensor single trigger)
+4 -4
drivers/staging/iio/inkern.c
··· 11 11 #include <linux/slab.h> 12 12 #include <linux/mutex.h> 13 13 14 - #include "iio.h" 14 + #include <linux/iio/iio.h> 15 15 #include "iio_core.h" 16 - #include "machine.h" 17 - #include "driver.h" 18 - #include "consumer.h" 16 + #include <linux/iio/machine.h> 17 + #include <linux/iio/driver.h> 18 + #include <linux/iio/consumer.h> 19 19 20 20 struct iio_map_internal { 21 21 struct iio_dev *indio_dev;
+1 -2
drivers/staging/iio/kfifo_buf.c
··· 5 5 #include <linux/workqueue.h> 6 6 #include <linux/kfifo.h> 7 7 #include <linux/mutex.h> 8 - 9 - #include "kfifo_buf.h" 8 + #include <linux/iio/kfifo_buf.h> 10 9 11 10 struct iio_kfifo { 12 11 struct iio_buffer buffer;
+2 -2
drivers/staging/iio/kfifo_buf.h include/linux/iio/kfifo_buf.h
··· 1 1 2 2 #include <linux/kfifo.h> 3 - #include "iio.h" 4 - #include "buffer.h" 3 + #include <linux/iio/iio.h> 4 + #include <linux/iio/buffer.h> 5 5 6 6 struct iio_buffer *iio_kfifo_allocate(struct iio_dev *indio_dev); 7 7 void iio_kfifo_free(struct iio_buffer *r);
+2 -2
drivers/staging/iio/light/isl29018.c
··· 28 28 #include <linux/delay.h> 29 29 #include <linux/regmap.h> 30 30 #include <linux/slab.h> 31 - #include "../iio.h" 32 - #include "../sysfs.h" 31 + #include <linux/iio/iio.h> 32 + #include <linux/iio/sysfs.h> 33 33 34 34 #define CONVERSION_TIME_MS 100 35 35
+2 -2
drivers/staging/iio/light/isl29028.c
··· 24 24 #include <linux/delay.h> 25 25 #include <linux/slab.h> 26 26 #include <linux/regmap.h> 27 - #include "../iio.h" 28 - #include "../sysfs.h" 27 + #include <linux/iio/iio.h> 28 + #include <linux/iio/sysfs.h> 29 29 30 30 #define CONVERSION_TIME_MS 100 31 31
+3 -3
drivers/staging/iio/light/tsl2563.c
··· 35 35 #include <linux/err.h> 36 36 #include <linux/slab.h> 37 37 38 - #include "../iio.h" 39 - #include "../sysfs.h" 40 - #include "../events.h" 38 + #include <linux/iio/iio.h> 39 + #include <linux/iio/sysfs.h> 40 + #include <linux/iio/events.h> 41 41 #include "tsl2563.h" 42 42 43 43 /* Use this many bits for fraction part. */
+1 -1
drivers/staging/iio/light/tsl2583.c
··· 28 28 #include <linux/unistd.h> 29 29 #include <linux/slab.h> 30 30 #include <linux/module.h> 31 - #include "../iio.h" 31 + #include <linux/iio/iio.h> 32 32 33 33 #define TSL258X_MAX_DEVICE_REGS 32 34 34
+3 -3
drivers/staging/iio/light/tsl2x7x_core.c
··· 28 28 #include <linux/slab.h> 29 29 #include <linux/module.h> 30 30 #include <linux/version.h> 31 + #include <linux/iio/events.h> 32 + #include <linux/iio/iio.h> 33 + #include <linux/iio/sysfs.h> 31 34 #include "tsl2x7x.h" 32 - #include "../events.h" 33 - #include "../iio.h" 34 - #include "../sysfs.h" 35 35 36 36 /* Cal defs*/ 37 37 #define PROX_STAT_CAL 0
drivers/staging/iio/machine.h include/linux/iio/machine.h
+2 -2
drivers/staging/iio/magnetometer/ak8975.c
··· 30 30 31 31 #include <linux/gpio.h> 32 32 33 - #include "../iio.h" 34 - #include "../sysfs.h" 33 + #include <linux/iio/iio.h> 34 + #include <linux/iio/sysfs.h> 35 35 /* 36 36 * Register definitions, as well as various shifts and masks to get at the 37 37 * individual fields of the registers.
+2 -2
drivers/staging/iio/magnetometer/hmc5843.c
··· 22 22 #include <linux/i2c.h> 23 23 #include <linux/slab.h> 24 24 #include <linux/types.h> 25 - #include "../iio.h" 26 - #include "../sysfs.h" 25 + #include <linux/iio/iio.h> 26 + #include <linux/iio/sysfs.h> 27 27 28 28 #define HMC5843_I2C_ADDRESS 0x1E 29 29
+2 -2
drivers/staging/iio/meter/ade7753.c
··· 18 18 #include <linux/list.h> 19 19 #include <linux/module.h> 20 20 21 - #include "../iio.h" 22 - #include "../sysfs.h" 21 + #include <linux/iio/iio.h> 22 + #include <linux/iio/sysfs.h> 23 23 #include "meter.h" 24 24 #include "ade7753.h" 25 25
+2 -2
drivers/staging/iio/meter/ade7754.c
··· 18 18 #include <linux/list.h> 19 19 #include <linux/module.h> 20 20 21 - #include "../iio.h" 22 - #include "../sysfs.h" 21 + #include <linux/iio/iio.h> 22 + #include <linux/iio/sysfs.h> 23 23 #include "meter.h" 24 24 #include "ade7754.h" 25 25
+3 -3
drivers/staging/iio/meter/ade7758_core.c
··· 18 18 #include <linux/list.h> 19 19 #include <linux/module.h> 20 20 21 - #include "../iio.h" 22 - #include "../sysfs.h" 23 - #include "../buffer.h" 21 + #include <linux/iio/iio.h> 22 + #include <linux/iio/sysfs.h> 23 + #include <linux/iio/buffer.h> 24 24 #include "meter.h" 25 25 #include "ade7758.h" 26 26
+2 -2
drivers/staging/iio/meter/ade7758_ring.c
··· 12 12 #include <linux/slab.h> 13 13 #include <asm/unaligned.h> 14 14 15 - #include "../iio.h" 15 + #include <linux/iio/iio.h> 16 16 #include "../ring_sw.h" 17 - #include "../trigger_consumer.h" 17 + #include <linux/iio/trigger_consumer.h> 18 18 #include "ade7758.h" 19 19 20 20 /**
+2 -2
drivers/staging/iio/meter/ade7758_trigger.c
··· 11 11 #include <linux/spi/spi.h> 12 12 #include <linux/export.h> 13 13 14 - #include "../iio.h" 15 - #include "../trigger.h" 14 + #include <linux/iio/iio.h> 15 + #include <linux/iio/trigger.h> 16 16 #include "ade7758.h" 17 17 18 18 /**
+2 -2
drivers/staging/iio/meter/ade7759.c
··· 18 18 #include <linux/list.h> 19 19 #include <linux/module.h> 20 20 21 - #include "../iio.h" 22 - #include "../sysfs.h" 21 + #include <linux/iio/iio.h> 22 + #include <linux/iio/sysfs.h> 23 23 #include "meter.h" 24 24 #include "ade7759.h" 25 25
+1 -1
drivers/staging/iio/meter/ade7854-i2c.c
··· 12 12 #include <linux/slab.h> 13 13 #include <linux/module.h> 14 14 15 - #include "../iio.h" 15 + #include <linux/iio/iio.h> 16 16 #include "ade7854.h" 17 17 18 18 static int ade7854_i2c_write_reg_8(struct device *dev,
+1 -1
drivers/staging/iio/meter/ade7854-spi.c
··· 12 12 #include <linux/slab.h> 13 13 #include <linux/module.h> 14 14 15 - #include "../iio.h" 15 + #include <linux/iio/iio.h> 16 16 #include "ade7854.h" 17 17 18 18 static int ade7854_spi_write_reg_8(struct device *dev,
+2 -2
drivers/staging/iio/meter/ade7854.c
··· 17 17 #include <linux/list.h> 18 18 #include <linux/module.h> 19 19 20 - #include "../iio.h" 21 - #include "../sysfs.h" 20 + #include <linux/iio/iio.h> 21 + #include <linux/iio/sysfs.h> 22 22 #include "meter.h" 23 23 #include "ade7854.h" 24 24
+1 -1
drivers/staging/iio/meter/meter.h
··· 1 - #include "../sysfs.h" 1 + #include <linux/iio/sysfs.h> 2 2 3 3 /* metering ic types of attribute */ 4 4
+2 -2
drivers/staging/iio/resolver/ad2s1200.c
··· 19 19 #include <linux/gpio.h> 20 20 #include <linux/module.h> 21 21 22 - #include "../iio.h" 23 - #include "../sysfs.h" 22 + #include <linux/iio/iio.h> 23 + #include <linux/iio/sysfs.h> 24 24 25 25 #define DRV_NAME "ad2s1200" 26 26
+2 -2
drivers/staging/iio/resolver/ad2s1210.c
··· 18 18 #include <linux/gpio.h> 19 19 #include <linux/module.h> 20 20 21 - #include "../iio.h" 22 - #include "../sysfs.h" 21 + #include <linux/iio/iio.h> 22 + #include <linux/iio/sysfs.h> 23 23 #include "ad2s1210.h" 24 24 25 25 #define DRV_NAME "ad2s1210"
+2 -2
drivers/staging/iio/resolver/ad2s90.c
··· 16 16 #include <linux/sysfs.h> 17 17 #include <linux/module.h> 18 18 19 - #include "../iio.h" 20 - #include "../sysfs.h" 19 + #include <linux/iio/iio.h> 20 + #include <linux/iio/sysfs.h> 21 21 22 22 struct ad2s90_state { 23 23 struct mutex lock;
+1 -1
drivers/staging/iio/ring_sw.c
··· 15 15 #include <linux/sched.h> 16 16 #include <linux/poll.h> 17 17 #include "ring_sw.h" 18 - #include "trigger.h" 18 + #include <linux/iio/trigger.h> 19 19 20 20 /** 21 21 * struct iio_sw_ring_buffer - software ring buffer
+1 -1
drivers/staging/iio/ring_sw.h
··· 23 23 24 24 #ifndef _IIO_RING_SW_H_ 25 25 #define _IIO_RING_SW_H_ 26 - #include "buffer.h" 26 + #include <linux/iio/buffer.h> 27 27 28 28 struct iio_buffer *iio_sw_rb_allocate(struct iio_dev *indio_dev); 29 29 void iio_sw_rb_free(struct iio_buffer *ring);
drivers/staging/iio/sysfs.h include/linux/iio/sysfs.h
drivers/staging/iio/trigger.h include/linux/iio/trigger.h
+2 -2
drivers/staging/iio/trigger/iio-trig-bfin-timer.c
··· 15 15 16 16 #include <asm/gptimers.h> 17 17 18 - #include "../iio.h" 19 - #include "../trigger.h" 18 + #include <linux/iio/iio.h> 19 + #include <linux/iio/trigger.h> 20 20 21 21 struct bfin_timer { 22 22 unsigned short id, bit;
+2 -2
drivers/staging/iio/trigger/iio-trig-gpio.c
··· 22 22 #include <linux/gpio.h> 23 23 #include <linux/slab.h> 24 24 25 - #include "../iio.h" 26 - #include "../trigger.h" 25 + #include <linux/iio/iio.h> 26 + #include <linux/iio/trigger.h> 27 27 28 28 static LIST_HEAD(iio_gpio_trigger_list); 29 29 static DEFINE_MUTEX(iio_gpio_trigger_list_lock);
+2 -2
drivers/staging/iio/trigger/iio-trig-periodic-rtc.c
··· 16 16 #include <linux/module.h> 17 17 #include <linux/slab.h> 18 18 #include <linux/rtc.h> 19 - #include "../iio.h" 20 - #include "../trigger.h" 19 + #include <linux/iio/iio.h> 20 + #include <linux/iio/trigger.h> 21 21 22 22 static LIST_HEAD(iio_prtc_trigger_list); 23 23 static DEFINE_MUTEX(iio_prtc_trigger_list_lock);
+2 -2
drivers/staging/iio/trigger/iio-trig-sysfs.c
··· 11 11 #include <linux/slab.h> 12 12 #include <linux/list.h> 13 13 14 - #include "../iio.h" 15 - #include "../trigger.h" 14 + #include <linux/iio/iio.h> 15 + #include <linux/iio/trigger.h> 16 16 17 17 struct iio_sysfs_trig { 18 18 struct iio_trigger *trig;
drivers/staging/iio/trigger_consumer.h include/linux/iio/trigger_consumer.h
drivers/staging/iio/types.h include/linux/iio/types.h