Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7b2c33b1 authored by Jonathan Cameron's avatar Jonathan Cameron Committed by Greg Kroah-Hartman
Browse files

staging: iio: remove timestamp field from trigger and pass instead through pollfuncs 



Signed-off-by: default avatarJonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent c3db00cc

drivers/staging/iio/accel/adis16209_ring.c

+2 −2
Original line number Diff line number Diff line
@@ -68,10 +68,10 @@ static struct attribute_group adis16209_scan_el_group = { 
 * adis16209_poll_func_th() top half interrupt handler called by trigger

 * @private_data:	iio_dev

 **/

static void adis16209_poll_func_th(struct iio_dev *indio_dev)

static void adis16209_poll_func_th(struct iio_dev *indio_dev, s64 time)

{

	struct adis16209_state *st = iio_dev_get_devdata(indio_dev);

	st->last_timestamp = indio_dev->trig->timestamp;

	st->last_timestamp = time;

	schedule_work(&st->work_trigger_to_ring);

}

drivers/staging/iio/accel/adis16209_trigger.c

+1 −2
Original line number Diff line number Diff line
@@ -23,8 +23,7 @@ static int adis16209_data_rdy_trig_poll(struct iio_dev *dev_info, 
	struct adis16209_state *st = iio_dev_get_devdata(dev_info);

	struct iio_trigger *trig = st->trig;



	trig->timestamp = timestamp;

	iio_trigger_poll(trig);

	iio_trigger_poll(trig, timestamp);



	return IRQ_HANDLED;

}

drivers/staging/iio/accel/adis16240_ring.c

+2 −2
Original line number Diff line number Diff line
@@ -62,10 +62,10 @@ static struct attribute_group adis16240_scan_el_group = { 
 * adis16240_poll_func_th() top half interrupt handler called by trigger

 * @private_data:	iio_dev

 **/

static void adis16240_poll_func_th(struct iio_dev *indio_dev)

static void adis16240_poll_func_th(struct iio_dev *indio_dev, s64 time)

{

	struct adis16240_state *st = iio_dev_get_devdata(indio_dev);

	st->last_timestamp = indio_dev->trig->timestamp;

	st->last_timestamp = time;

	schedule_work(&st->work_trigger_to_ring);

}

drivers/staging/iio/accel/adis16240_trigger.c

+1 −2
Original line number Diff line number Diff line
@@ -23,8 +23,7 @@ static int adis16240_data_rdy_trig_poll(struct iio_dev *dev_info, 
	struct adis16240_state *st = iio_dev_get_devdata(dev_info);

	struct iio_trigger *trig = st->trig;



	trig->timestamp = timestamp;

	iio_trigger_poll(trig);

	iio_trigger_poll(trig, timestamp);



	return IRQ_HANDLED;

}

drivers/staging/iio/accel/lis3l02dq_ring.c

+4 −5
Original line number Diff line number Diff line
@@ -103,10 +103,10 @@ static struct attribute_group lis3l02dq_scan_el_group = { 
 * lis3l02dq_poll_func_th() top half interrupt handler called by trigger

 * @private_data:	iio_dev

 **/

static void lis3l02dq_poll_func_th(struct iio_dev *indio_dev)

static void lis3l02dq_poll_func_th(struct iio_dev *indio_dev, s64 time)

{

	struct lis3l02dq_state *st = iio_dev_get_devdata(indio_dev);

	st->last_timestamp = indio_dev->trig->timestamp;

	st->last_timestamp = time;

	schedule_work(&st->work_trigger_to_ring);

	/* Indicate that this interrupt is being handled */
@@ -128,8 +128,7 @@ static int lis3l02dq_data_rdy_trig_poll(struct iio_dev *dev_info, 
	struct lis3l02dq_state *st = iio_dev_get_devdata(dev_info);

	struct iio_trigger *trig = st->trig;



	trig->timestamp = timestamp;

	iio_trigger_poll(trig);

	iio_trigger_poll(trig, timestamp);



	return IRQ_HANDLED;

}