diff options
Diffstat (limited to 'drivers/staging/iio/accel/adis16240_trigger.c')
-rw-r--r-- | drivers/staging/iio/accel/adis16240_trigger.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/drivers/staging/iio/accel/adis16240_trigger.c b/drivers/staging/iio/accel/adis16240_trigger.c index ece3ca8fb7e..17135fc33c9 100644 --- a/drivers/staging/iio/accel/adis16240_trigger.c +++ b/drivers/staging/iio/accel/adis16240_trigger.c @@ -27,17 +27,16 @@ static irqreturn_t adis16240_data_rdy_trig_poll(int irq, void *trig) static int adis16240_data_rdy_trigger_set_state(struct iio_trigger *trig, bool state) { - struct adis16240_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 adis16240_set_irq(st->indio_dev, state); + return adis16240_set_irq(indio_dev, state); } int adis16240_probe_trigger(struct iio_dev *indio_dev) { int ret; - struct adis16240_state *st = indio_dev->dev_data; + struct adis16240_state *st = iio_priv(indio_dev); st->trig = iio_allocate_trigger("adis16240-dev%d", indio_dev->id); if (st->trig == NULL) { @@ -55,7 +54,7 @@ int adis16240_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 = &adis16240_data_rdy_trigger_set_state; ret = iio_trigger_register(st->trig); @@ -76,9 +75,9 @@ error_ret: void adis16240_remove_trigger(struct iio_dev *indio_dev) { - struct adis16240_state *state = indio_dev->dev_data; + struct adis16240_state *st = iio_priv(indio_dev); - iio_trigger_unregister(state->trig); - free_irq(state->us->irq, state->trig); - iio_free_trigger(state->trig); + iio_trigger_unregister(st->trig); + free_irq(st->us->irq, st->trig); + iio_free_trigger(st->trig); } |