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>

1 files changed, 10 insertions, 6 deletions

diff --git a/include/linux/iio/iio.h b/include/linux/iio/iio.h
index 75a8a20c8179..5f2d00e7e488 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