diff options
author | Lars-Peter Clausen <lars@metafoo.de> | 2012-08-17 11:57:00 -0400 |
---|---|---|
committer | Jonathan Cameron <jic23@kernel.org> | 2012-08-27 13:57:56 -0400 |
commit | 08d6005c031631429ed307a28503e00e3970c203 (patch) | |
tree | bdfe514e6717831de7f31461cd28976ad5c85bfc | |
parent | 88238fef16845c18abecb9285c97b0225f71d544 (diff) |
iio: Add missing include guards to headers
Add include guards to the IIO headers where they are missing. This avoids
compile errors due to redefined types if a file is included more than once.
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
-rw-r--r-- | include/linux/iio/kfifo_buf.h | 3 | ||||
-rw-r--r-- | include/linux/iio/machine.h | 5 | ||||
-rw-r--r-- | include/linux/iio/trigger_consumer.h | 5 |
3 files changed, 13 insertions, 0 deletions
diff --git a/include/linux/iio/kfifo_buf.h b/include/linux/iio/kfifo_buf.h index 014d5a13b32b..25eeac762e84 100644 --- a/include/linux/iio/kfifo_buf.h +++ b/include/linux/iio/kfifo_buf.h | |||
@@ -1,3 +1,5 @@ | |||
1 | #ifndef __LINUX_IIO_KFIFO_BUF_H__ | ||
2 | #define __LINUX_IIO_KFIFO_BUF_H__ | ||
1 | 3 | ||
2 | #include <linux/kfifo.h> | 4 | #include <linux/kfifo.h> |
3 | #include <linux/iio/iio.h> | 5 | #include <linux/iio/iio.h> |
@@ -6,3 +8,4 @@ | |||
6 | struct iio_buffer *iio_kfifo_allocate(struct iio_dev *indio_dev); | 8 | struct iio_buffer *iio_kfifo_allocate(struct iio_dev *indio_dev); |
7 | void iio_kfifo_free(struct iio_buffer *r); | 9 | void iio_kfifo_free(struct iio_buffer *r); |
8 | 10 | ||
11 | #endif | ||
diff --git a/include/linux/iio/machine.h b/include/linux/iio/machine.h index 400a453ff67b..809a3f08d5a5 100644 --- a/include/linux/iio/machine.h +++ b/include/linux/iio/machine.h | |||
@@ -8,6 +8,9 @@ | |||
8 | * the Free Software Foundation. | 8 | * the Free Software Foundation. |
9 | */ | 9 | */ |
10 | 10 | ||
11 | #ifndef __LINUX_IIO_MACHINE_H__ | ||
12 | #define __LINUX_IIO_MACHINE_H__ | ||
13 | |||
11 | /** | 14 | /** |
12 | * struct iio_map - description of link between consumer and device channels | 15 | * struct iio_map - description of link between consumer and device channels |
13 | * @adc_channel_label: Label used to identify the channel on the provider. | 16 | * @adc_channel_label: Label used to identify the channel on the provider. |
@@ -22,3 +25,5 @@ struct iio_map { | |||
22 | const char *consumer_dev_name; | 25 | const char *consumer_dev_name; |
23 | const char *consumer_channel; | 26 | const char *consumer_channel; |
24 | }; | 27 | }; |
28 | |||
29 | #endif | ||
diff --git a/include/linux/iio/trigger_consumer.h b/include/linux/iio/trigger_consumer.h index 60d64b356945..762a3d3ee547 100644 --- a/include/linux/iio/trigger_consumer.h +++ b/include/linux/iio/trigger_consumer.h | |||
@@ -7,6 +7,9 @@ | |||
7 | * the Free Software Foundation. | 7 | * the Free Software Foundation. |
8 | */ | 8 | */ |
9 | 9 | ||
10 | #ifndef __LINUX_IIO_TRIGGER_CONSUMER_H__ | ||
11 | #define __LINUX_IIO_TRIGGER_CONSUMER_H__ | ||
12 | |||
10 | /** | 13 | /** |
11 | * struct iio_poll_func - poll function pair | 14 | * struct iio_poll_func - poll function pair |
12 | * | 15 | * |
@@ -50,3 +53,5 @@ void iio_trigger_notify_done(struct iio_trigger *trig); | |||
50 | */ | 53 | */ |
51 | int iio_triggered_buffer_postenable(struct iio_dev *indio_dev); | 54 | int iio_triggered_buffer_postenable(struct iio_dev *indio_dev); |
52 | int iio_triggered_buffer_predisable(struct iio_dev *indio_dev); | 55 | int iio_triggered_buffer_predisable(struct iio_dev *indio_dev); |
56 | |||
57 | #endif | ||