diff options
| author | Jonathan Cameron <jic23@cam.ac.uk> | 2011-09-30 09:05:42 (GMT) |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-10-03 23:07:05 (GMT) |
| commit | 8cbb36a0236954527a8f7b66145f786d09b55ab9 (patch) | |
| tree | 64833c6c420935ad5a2c5b7da3d4fed3cf46a8df /drivers/staging/iio/adc/ad7606_core.c | |
| parent | 4f5495d0a5c3a4a0174ad8e7eca2ad579d03deff (diff) | |
| download | linux-fsl-qoriq-8cbb36a0236954527a8f7b66145f786d09b55ab9.tar.xz | |
staging:iio:adc:ad7606 refactor to remove st->irq and st->id.
id wasn't used anywhere and st->irq can be removed by simply
passing it into the core remove function (trivially available in
the two bus implementations).
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/adc/ad7606_core.c')
| -rw-r--r-- | drivers/staging/iio/adc/ad7606_core.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/staging/iio/adc/ad7606_core.c b/drivers/staging/iio/adc/ad7606_core.c index e762acb..3c0fb72 100644 --- a/drivers/staging/iio/adc/ad7606_core.c +++ b/drivers/staging/iio/adc/ad7606_core.c @@ -459,8 +459,6 @@ struct iio_dev *ad7606_probe(struct device *dev, int irq, st = iio_priv(indio_dev); st->dev = dev; - st->id = id; - st->irq = irq; st->bops = bops; st->base_address = base_address; st->range = pdata->default_range == 10000 ? 10000 : 5000; @@ -501,7 +499,7 @@ struct iio_dev *ad7606_probe(struct device *dev, int irq, if (ret) dev_warn(st->dev, "failed to RESET: no RESET GPIO specified\n"); - ret = request_irq(st->irq, ad7606_interrupt, + ret = request_irq(irq, ad7606_interrupt, IRQF_TRIGGER_FALLING, st->chip_info->name, indio_dev); if (ret) goto error_free_gpios; @@ -527,7 +525,7 @@ error_cleanup_ring: ad7606_ring_cleanup(indio_dev); error_free_irq: - free_irq(st->irq, indio_dev); + free_irq(irq, indio_dev); error_free_gpios: ad7606_free_gpios(st); @@ -543,14 +541,14 @@ error_ret: return ERR_PTR(ret); } -int ad7606_remove(struct iio_dev *indio_dev) +int ad7606_remove(struct iio_dev *indio_dev, int irq) { struct ad7606_state *st = iio_priv(indio_dev); iio_buffer_unregister(indio_dev); ad7606_ring_cleanup(indio_dev); - free_irq(st->irq, indio_dev); + free_irq(irq, indio_dev); if (!IS_ERR(st->reg)) { regulator_disable(st->reg); regulator_put(st->reg); |