From: Jonathan Cameron <jic23@kernel.org>
Date: Fri, 13 Apr 2012 09:43:00 +0000 (+0100)
Subject: staging:iio:core drop the IIO_CHAN macro for ease of maintenance.
X-Git-Tag: firefly_0821_release~3680^2~2823^2~229^2~189
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=5b6bd35cc97ccd222282bdce33a8c56bf0ee3560;p=firefly-linux-kernel-4.4.55.git

staging:iio:core drop the IIO_CHAN macro for ease of maintenance.

I was warned long ago that this macro would cause trouble but didn't
heed the advice, hence I'm unwinding it now!

Signed-off-by: Jonathan Cameron <jic23@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/staging/iio/iio.h b/drivers/staging/iio/iio.h
index 48248122ee4f..fa6fca0f6605 100644
--- a/drivers/staging/iio/iio.h
+++ b/drivers/staging/iio/iio.h
@@ -176,23 +176,6 @@ struct iio_chan_spec {
 #define IIO_ST(si, rb, sb, sh)						\
 	{ .sign = si, .realbits = rb, .storagebits = sb, .shift = sh }
 
-/* Macro assumes input channels */
-#define IIO_CHAN(_type, _mod, _indexed, _proc, _name, _chan, _chan2, \
-		 _inf_mask, _address, _si, _stype, _event_mask)		\
-	{ .type = _type,						\
-	  .output = 0,							\
-	  .modified = _mod,						\
-	  .indexed = _indexed,						\
-	  .processed_val = _proc,					\
-	  .extend_name = _name,						\
-	  .channel = _chan,						\
-	  .channel2 = _chan2,						\
-	  .info_mask = _inf_mask,					\
-	  .address = _address,						\
-	  .scan_index = _si,						\
-	  .scan_type = _stype,						\
-	  .event_mask = _event_mask }
-
 #define IIO_CHAN_SOFT_TIMESTAMP(_si)					\
 	{ .type = IIO_TIMESTAMP, .channel = -1,				\
 			.scan_index = _si, .scan_type = IIO_ST('s', 64, 64, 0) }