diff options
author | Jonathan Cameron <jic23@cam.ac.uk> | 2010-07-11 16:39:11 +0100 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-07-22 11:38:28 -0700 |
commit | 7b2c33b11ef003d83c87a58201ff42313e13eff4 (patch) | |
tree | 15a38e57525a000767840fe769d2270fe76bda8c /drivers/staging/iio/accel | |
parent | c3db00cc80cf01f9a2033c3f3eb03345d0024761 (diff) |
staging: iio: remove timestamp field from trigger and pass instead through pollfuncs
Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/iio/accel')
-rw-r--r-- | drivers/staging/iio/accel/adis16209_ring.c | 4 | ||||
-rw-r--r-- | drivers/staging/iio/accel/adis16209_trigger.c | 3 | ||||
-rw-r--r-- | drivers/staging/iio/accel/adis16240_ring.c | 4 | ||||
-rw-r--r-- | drivers/staging/iio/accel/adis16240_trigger.c | 3 | ||||
-rw-r--r-- | drivers/staging/iio/accel/lis3l02dq_ring.c | 9 |
5 files changed, 10 insertions, 13 deletions
diff --git a/drivers/staging/iio/accel/adis16209_ring.c b/drivers/staging/iio/accel/adis16209_ring.c index 3b42a657941..ad715388156 100644 --- a/drivers/staging/iio/accel/adis16209_ring.c +++ b/drivers/staging/iio/accel/adis16209_ring.c @@ -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); } diff --git a/drivers/staging/iio/accel/adis16209_trigger.c b/drivers/staging/iio/accel/adis16209_trigger.c index cd901a4ca3f..1487effa2e3 100644 --- a/drivers/staging/iio/accel/adis16209_trigger.c +++ b/drivers/staging/iio/accel/adis16209_trigger.c @@ -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; } diff --git a/drivers/staging/iio/accel/adis16240_ring.c b/drivers/staging/iio/accel/adis16240_ring.c index 08fef633fc9..5cced2ecead 100644 --- a/drivers/staging/iio/accel/adis16240_ring.c +++ b/drivers/staging/iio/accel/adis16240_ring.c @@ -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); } diff --git a/drivers/staging/iio/accel/adis16240_trigger.c b/drivers/staging/iio/accel/adis16240_trigger.c index d58b4058688..2ba71fd73a4 100644 --- a/drivers/staging/iio/accel/adis16240_trigger.c +++ b/drivers/staging/iio/accel/adis16240_trigger.c @@ -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; } diff --git a/drivers/staging/iio/accel/lis3l02dq_ring.c b/drivers/staging/iio/accel/lis3l02dq_ring.c index bc0de784104..28d95ed0b24 100644 --- a/drivers/staging/iio/accel/lis3l02dq_ring.c +++ b/drivers/staging/iio/accel/lis3l02dq_ring.c @@ -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; + struct lis3l02dq_state *st = iio_dev_get_devdata(indio_dev); + 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; } |