Commit 3badbdac authored by Jonathan Cameron's avatar Jonathan Cameron Committed by Greg Kroah-Hartman
Browse files

staging:iio:accel:lis3l02dq 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 e13f3d5a

drivers/staging/iio/accel/lis3l02dq_core.c

+19 −6
Original line number Diff line number Diff line
@@ -521,13 +521,26 @@ static irqreturn_t lis3l02dq_event_handler(int irq, void *private) 
	(IIO_EV_BIT(IIO_EV_TYPE_THRESH, IIO_EV_DIR_RISING) |	\

	 IIO_EV_BIT(IIO_EV_TYPE_THRESH, IIO_EV_DIR_FALLING))



#define LIS3L02DQ_CHAN(index, mod)				\

	{							\

		.type = IIO_ACCEL,				\

		.modified = 1,					\

		.channel2 = mod,				\

		.info_mask =  LIS3L02DQ_INFO_MASK,		\

		.address = index,				\

		.scan_index = index,				\

		.scan_type = {					\

			.sign = 's',				\

			.realbits = 12,				\

			.storagebits = 16,			\

		},						\

		.event_mask = LIS3L02DQ_EVENT_MASK,		\

	 }



static struct iio_chan_spec lis3l02dq_channels[] = {

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

		 0, 0, IIO_ST('s', 12, 16, 0), LIS3L02DQ_EVENT_MASK),

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

		 1, 1, IIO_ST('s', 12, 16, 0), LIS3L02DQ_EVENT_MASK),

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

		 2, 2, IIO_ST('s', 12, 16, 0), LIS3L02DQ_EVENT_MASK),

	LIS3L02DQ_CHAN(0, IIO_MOD_X),

	LIS3L02DQ_CHAN(1, IIO_MOD_Y),

	LIS3L02DQ_CHAN(2, IIO_MOD_Z),

	IIO_CHAN_SOFT_TIMESTAMP(3)

};