diff options
author | Jonathan Cameron <jic23@cam.ac.uk> | 2011-06-27 13:07:12 +0100 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-06-28 14:39:35 -0700 |
commit | 4de66bbb3eb1099a76e1bbf87e376c7a31dc30d5 (patch) | |
tree | 3de9a668595c2c82a963bcb345a084a2b0400401 /drivers/staging/iio/accel/adis16204_trigger.c | |
parent | 6a0d8090a6a2722d25bda04aa250752e0ea56381 (diff) |
staging:iio:accel:adis16204 allocate tx and rx in state plus state via iio_priv
Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
Acked-by: Michael Hennerich <michael.hennerich@analog.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/iio/accel/adis16204_trigger.c')
-rw-r--r-- | drivers/staging/iio/accel/adis16204_trigger.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/staging/iio/accel/adis16204_trigger.c b/drivers/staging/iio/accel/adis16204_trigger.c index 5e1f9ae9d5c1..01f73b9b8886 100644 --- a/drivers/staging/iio/accel/adis16204_trigger.c +++ b/drivers/staging/iio/accel/adis16204_trigger.c @@ -18,17 +18,16 @@ static int adis16204_data_rdy_trigger_set_state(struct iio_trigger *trig, bool state) { - struct adis16204_state *st = trig->private_data; - struct iio_dev *indio_dev = st->indio_dev; + struct iio_dev *indio_dev = trig->private_data; dev_dbg(&indio_dev->dev, "%s (%d)\n", __func__, state); - return adis16204_set_irq(st->indio_dev, state); + return adis16204_set_irq(indio_dev, state); } int adis16204_probe_trigger(struct iio_dev *indio_dev) { int ret; - struct adis16204_state *st = indio_dev->dev_data; + struct adis16204_state *st = iio_priv(indio_dev); st->trig = iio_allocate_trigger("adis16204-dev%d", indio_dev->id); if (st->trig == NULL) { @@ -46,7 +45,7 @@ int adis16204_probe_trigger(struct iio_dev *indio_dev) st->trig->dev.parent = &st->us->dev; st->trig->owner = THIS_MODULE; - st->trig->private_data = st; + st->trig->private_data = indio_dev; st->trig->set_trigger_state = &adis16204_data_rdy_trigger_set_state; ret = iio_trigger_register(st->trig); @@ -67,7 +66,7 @@ error_ret: void adis16204_remove_trigger(struct iio_dev *indio_dev) { - struct adis16204_state *state = indio_dev->dev_data; + struct adis16204_state *state = iio_priv(indio_dev); iio_trigger_unregister(state->trig); free_irq(state->us->irq, state->trig); |