diff options
Diffstat (limited to 'drivers/staging/iio/meter/ade7758_trigger.c')
| -rw-r--r-- | drivers/staging/iio/meter/ade7758_trigger.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/staging/iio/meter/ade7758_trigger.c b/drivers/staging/iio/meter/ade7758_trigger.c index 5442d79..a5c3248 100644 --- a/drivers/staging/iio/meter/ade7758_trigger.c +++ b/drivers/staging/iio/meter/ade7758_trigger.c @@ -37,8 +37,7 @@ static irqreturn_t ade7758_data_rdy_trig_poll(int irq, void *private) static int ade7758_data_rdy_trigger_set_state(struct iio_trigger *trig, bool state) { - struct ade7758_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 ade7758_set_irq(&indio_dev->dev, state); @@ -50,7 +49,8 @@ static int ade7758_data_rdy_trigger_set_state(struct iio_trigger *trig, **/ static int ade7758_trig_try_reen(struct iio_trigger *trig) { - struct ade7758_state *st = trig->private_data; + struct iio_dev *indio_dev = trig->private_data; + struct ade7758_state *st = iio_priv(indio_dev); enable_irq(st->us->irq); /* irq reenabled so success! */ @@ -59,8 +59,8 @@ static int ade7758_trig_try_reen(struct iio_trigger *trig) int ade7758_probe_trigger(struct iio_dev *indio_dev) { + struct ade7758_state *st = iio_priv(indio_dev); int ret; - struct ade7758_state *st = indio_dev->dev_data; st->trig = iio_allocate_trigger("%s-dev%d", spi_get_device_id(st->us)->name, @@ -80,7 +80,7 @@ int ade7758_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 = &ade7758_data_rdy_trigger_set_state; st->trig->try_reenable = &ade7758_trig_try_reen; ret = iio_trigger_register(st->trig); @@ -102,9 +102,9 @@ error_ret: void ade7758_remove_trigger(struct iio_dev *indio_dev) { - struct ade7758_state *state = indio_dev->dev_data; + struct ade7758_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); } |