Commit 691a4ca1 authored by Jonathan Cameron's avatar Jonathan Cameron Committed by Greg Kroah-Hartman
Browse files

staging:iio:accel:sca3000 unwind use of IIO_CHAN macro. 



This macro is being removed to simplify ongoing maintenance
so we need to unwind and remaining users.

Signed-off-by: default avatarJonathan Cameron <jic23@kernel.org>
Reviewed-by: default avatarLars-Peter Clausen <lars@metafoo.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 3badbdac

drivers/staging/iio/accel/sca3000_core.c

+20 −6
Original line number Diff line number Diff line
@@ -433,13 +433,27 @@ static IIO_DEVICE_ATTR(revision, S_IRUGO, sca3000_show_rev, NULL, 0); 
#define SCA3000_EVENT_MASK					\

	(IIO_EV_BIT(IIO_EV_TYPE_MAG, IIO_EV_DIR_RISING))



#define SCA3000_CHAN(index, mod)				\

	{							\

		.type = IIO_ACCEL,				\

		.modified = 1,					\

		.channel2 = mod,				\

		.info_mask = SCA3000_INFO_MASK,			\

		.address = index,				\

		.scan_index = index,				\

		.scan_type = {					\

			.sign = 's',				\

			.realbits = 11,				\

			.storagebits = 16,			\

			.shift = 5,				\

		},						\

		.event_mask = SCA3000_EVENT_MASK,		\

	 }



static struct iio_chan_spec sca3000_channels[] = {

	IIO_CHAN(IIO_ACCEL, 1, 0, 0, NULL, 0, IIO_MOD_X, SCA3000_INFO_MASK,

		 0, 0, IIO_ST('s', 11, 16, 5), SCA3000_EVENT_MASK),

	IIO_CHAN(IIO_ACCEL, 1, 0, 0, NULL, 0, IIO_MOD_Y, SCA3000_INFO_MASK,

		 1, 1, IIO_ST('s', 11, 16, 5), SCA3000_EVENT_MASK),

	IIO_CHAN(IIO_ACCEL, 1, 0, 0, NULL, 0, IIO_MOD_Z, SCA3000_INFO_MASK,

		 2, 2, IIO_ST('s', 11, 16, 5), SCA3000_EVENT_MASK),

	SCA3000_CHAN(0, IIO_MOD_X),

	SCA3000_CHAN(1, IIO_MOD_Y),

	SCA3000_CHAN(2, IIO_MOD_Z),

};



static u8 sca3000_addresses[3][3] = {