Staging: iio: Added define guards where needed
authorCristina Opriceana <cristina.opriceana@gmail.com>
Wed, 4 Mar 2015 00:37:15 +0000 (02:37 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 6 Mar 2015 17:54:33 +0000 (09:54 -0800)
The following files were added define guards to prevent multiple
inclusion.

Signed-off-by: Cristina Opriceana <cristina.opriceana@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/iio/Documentation/iio_utils.h
drivers/staging/iio/accel/sca3000.h
drivers/staging/iio/frequency/dds.h
drivers/staging/iio/meter/meter.h
drivers/staging/iio/resolver/ad2s1210.h

index 568eff06f803169474f3caebf99431efb0db30bb..bd6982c12d0def7c1fb0185aebb51228da0ec877 100644 (file)
@@ -6,6 +6,8 @@
  * under the terms of the GNU General Public License version 2 as published by
  * the Free Software Foundation.
  */
+#ifndef _IIO_UTILS_H
+#define _IIO_UTILS_H
 
 #include <string.h>
 #include <stdlib.h>
@@ -681,3 +683,5 @@ error_free:
        free(temp);
        return ret;
 }
+
+#endif /* _IIO_UTILS_H */
index b284e5a6cac1d3d4b5e38a0127fde360ac516196..9c8a9587df7d6fa3e79163bff8a2b2dc18027b26 100644 (file)
@@ -38,6 +38,9 @@
  * Can probably alleviate this by reading the interrupt register on start, but
  * that is really just brushing the problem under the carpet.
  */
+#ifndef _SCA3000
+#define _SCA3000
+
 #define SCA3000_WRITE_REG(a) (((a) << 2) | 0x02)
 #define SCA3000_READ_REG(a) ((a) << 2)
 
@@ -272,4 +275,4 @@ static inline void sca3000_ring_int_process(u8 val, void *ring)
 }
 
 #endif
-
+#endif /* _SCA3000 */
index 611e2b0cfc4cde3614080f07ff8018fd2dbb702f..fe53e7324c9458fb64d69b85b80e0d18b85474c0 100644 (file)
@@ -5,6 +5,8 @@
  *
  * Licensed under the GPL-2 or later.
  */
+#ifndef IIO_DDS_H_
+#define IIO_DDS_H_
 
 /**
  * /sys/bus/iio/devices/.../out_altvoltageX_frequencyY
 #define IIO_CONST_ATTR_OUT_WAVETYPES_AVAILABLE(_channel, _output, _modes)\
        IIO_CONST_ATTR(                                                 \
        out_altvoltage##_channel##_out##_output##_wavetype_available, _modes)
+
+#endif /* IIO_DDS_H_ */
index 8f0de02839b73c72d7ff83998133e8801c91979a..dfba510f29be6c764a42f94e538a7ab7ab910e93 100644 (file)
@@ -1,3 +1,6 @@
+#ifndef _METER_H
+#define _METER_H
+
 #include <linux/iio/sysfs.h>
 
 /* metering ic types of attribute */
 #define IIO_EVENT_ATTR_VPKLVL_EXC(_evlist, _show, _store, _mask) \
        IIO_EVENT_ATTR_SH(vpklvl_exc, _evlist, _show, _store, _mask)
 
+#endif /* _METER_H */
index aec0bdca16a48d13de38b8196a722fc3537c65a4..c7158f6e61c23c7fa0090bc2f19f63f19acbcb62 100644 (file)
@@ -8,6 +8,8 @@
  * it under the terms of the GNU General Public License version 2 as
  * published by the Free Software Foundation.
  */
+#ifndef _AD2S1210_H
+#define _AD2S1210_H
 
 struct ad2s1210_platform_data {
        unsigned sample;
@@ -15,3 +17,4 @@ struct ad2s1210_platform_data {
        unsigned res[2];
        bool gpioin;
 };
+#endif /* _AD2S1210_H */