summaryrefslogtreecommitdiffstats
path: root/include/linux/iio/iio.h
diff options
context:
space:
mode:
authorJonathan Cameron <jic23@kernel.org>2013-11-12 18:45:00 +0000
committerJonathan Cameron <jic23@kernel.org>2014-02-15 10:58:17 +0000
commit07d4655b410a4da3bdffbc9ed01d9fef67f682a6 (patch)
tree950c864dba2e6ee73bc2ec4add69a0f4c05fa0da /include/linux/iio/iio.h
parent33be5fd1c9a9e1c092205abbdea6ada0956c93a8 (diff)
downloadop-kernel-dev-07d4655b410a4da3bdffbc9ed01d9fef67f682a6.zip
op-kernel-dev-07d4655b410a4da3bdffbc9ed01d9fef67f682a6.tar.gz
iio:drop IIO_ST macro
This macro no longer allows all the elements of the scan_type structure to be set. Missinterpretation of the parameters also caused a couple of recent bugs. No mainline drivers now use this macro so drop it. Signed-off-by: Jonathan Cameron <jic23@kernel.org>
Diffstat (limited to 'include/linux/iio/iio.h')
-rw-r--r--include/linux/iio/iio.h16
1 files changed, 10 insertions, 6 deletions
diff --git a/include/linux/iio/iio.h b/include/linux/iio/iio.h
index 75a8a20..5f2d00e 100644
--- a/include/linux/iio/iio.h
+++ b/include/linux/iio/iio.h
@@ -254,12 +254,16 @@ static inline bool iio_channel_has_info(const struct iio_chan_spec *chan,
(chan->info_mask_shared_by_all & BIT(type));
}
-#define IIO_ST(si, rb, sb, sh) \
- { .sign = si, .realbits = rb, .storagebits = sb, .shift = sh }
-
-#define IIO_CHAN_SOFT_TIMESTAMP(_si) \
- { .type = IIO_TIMESTAMP, .channel = -1, \
- .scan_index = _si, .scan_type = IIO_ST('s', 64, 64, 0) }
+#define IIO_CHAN_SOFT_TIMESTAMP(_si) { \
+ .type = IIO_TIMESTAMP, \
+ .channel = -1, \
+ .scan_index = _si, \
+ .scan_type = { \
+ .sign = 's', \
+ .realbits = 64, \
+ .storagebits = 64, \
+ }, \
+}
/**
* iio_get_time_ns() - utility function to get a time stamp for events etc
OpenPOWER on IntegriCloud