summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonathan Cameron <jic23@cam.ac.uk>2012-02-15 19:48:02 +0000
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-02-24 12:10:03 -0800
commitad2c08b620aafc9362bd7a8a0fb828a9bb9386de (patch)
tree79282324d29fd9686a850fd7ae0983d408dbd671
parente27d75d71c0dbbab83768c6e327d13f445d0214f (diff)
downloadlinux-stable-ad2c08b620aafc9362bd7a8a0fb828a9bb9386de.tar.gz
linux-stable-ad2c08b620aafc9362bd7a8a0fb828a9bb9386de.tar.bz2
linux-stable-ad2c08b620aafc9362bd7a8a0fb828a9bb9386de.zip
staging:iio: move iio data return types into types.h for use by inkern
In kernel interfaces need these, so make them available. Signed-off-by: Jonathan Cameron <jic23@kernel.org> Acked-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/staging/iio/iio.h6
-rw-r--r--drivers/staging/iio/types.h4
2 files changed, 4 insertions, 6 deletions
diff --git a/drivers/staging/iio/iio.h b/drivers/staging/iio/iio.h
index 478dbe5924cb..9459c17dee48 100644
--- a/drivers/staging/iio/iio.h
+++ b/drivers/staging/iio/iio.h
@@ -197,12 +197,6 @@ static inline s64 iio_get_time_ns(void)
#define INDIO_ALL_BUFFER_MODES \
(INDIO_BUFFER_TRIGGERED | INDIO_BUFFER_HARDWARE)
-/* Vast majority of this is set by the industrialio subsystem on a
- * call to iio_device_register. */
-#define IIO_VAL_INT 1
-#define IIO_VAL_INT_PLUS_MICRO 2
-#define IIO_VAL_INT_PLUS_NANO 3
-
struct iio_trigger; /* forward declaration */
struct iio_dev;
diff --git a/drivers/staging/iio/types.h b/drivers/staging/iio/types.h
index b7d26474ad06..0c3213666901 100644
--- a/drivers/staging/iio/types.h
+++ b/drivers/staging/iio/types.h
@@ -46,4 +46,8 @@ enum iio_modifier {
IIO_MOD_LIGHT_IR,
};
+#define IIO_VAL_INT 1
+#define IIO_VAL_INT_PLUS_MICRO 2
+#define IIO_VAL_INT_PLUS_NANO 3
+
#endif /* _IIO_TYPES_H_ */