From 6c4945eaac152f8c2b4a6f74f7fc5fd42235e6fd Mon Sep 17 00:00:00 2001
From: Jonathan Cameron <jic23@cam.ac.uk>
Date: Fri, 30 Sep 2011 10:05:42 +0100
Subject: [PATCH] --- yaml --- r: 268599 b: refs/heads/master c:
 8cbb36a0236954527a8f7b66145f786d09b55ab9 h: refs/heads/master i:   268597:
 969e260ed34c4a1d52c59fce6c045be50079c800   268595:
 0c12cea11e803bb42e0d97453f8ec35ae453bf5f   268591:
 ba3c78ebba2349d98954ee7a24e6ae3e59092fae v: v3

---
 [refs]                                      |  2 +-
 trunk/drivers/staging/iio/adc/ad7606.h      |  4 +---
 trunk/drivers/staging/iio/adc/ad7606_core.c | 10 ++++------
 trunk/drivers/staging/iio/adc/ad7606_par.c  |  2 +-
 trunk/drivers/staging/iio/adc/ad7606_spi.c  |  2 +-
 5 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/[refs] b/[refs]
index 1680aba3a44a..b42e388625e1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4f5495d0a5c3a4a0174ad8e7eca2ad579d03deff
+refs/heads/master: 8cbb36a0236954527a8f7b66145f786d09b55ab9
diff --git a/trunk/drivers/staging/iio/adc/ad7606.h b/trunk/drivers/staging/iio/adc/ad7606.h
index bc95f09327aa..0d1bb261c793 100644
--- a/trunk/drivers/staging/iio/adc/ad7606.h
+++ b/trunk/drivers/staging/iio/adc/ad7606.h
@@ -69,8 +69,6 @@ struct ad7606_state {
 	struct work_struct		poll_work;
 	wait_queue_head_t		wq_data_avail;
 	const struct ad7606_bus_ops	*bops;
-	int				irq;
-	unsigned			id;
 	unsigned			range;
 	unsigned			oversampling;
 	bool				done;
@@ -94,7 +92,7 @@ void ad7606_resume(struct iio_dev *indio_dev);
 struct iio_dev *ad7606_probe(struct device *dev, int irq,
 			      void __iomem *base_address, unsigned id,
 			      const struct ad7606_bus_ops *bops);
-int ad7606_remove(struct iio_dev *indio_dev);
+int ad7606_remove(struct iio_dev *indio_dev, int irq);
 int ad7606_reset(struct ad7606_state *st);
 
 enum ad7606_supported_device_ids {
diff --git a/trunk/drivers/staging/iio/adc/ad7606_core.c b/trunk/drivers/staging/iio/adc/ad7606_core.c
index e762acb8fc2b..3c0fb729891a 100644
--- a/trunk/drivers/staging/iio/adc/ad7606_core.c
+++ b/trunk/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 @@ struct iio_dev *ad7606_probe(struct device *dev, int irq,
 	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 @@ struct iio_dev *ad7606_probe(struct device *dev, int irq,
 	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);
diff --git a/trunk/drivers/staging/iio/adc/ad7606_par.c b/trunk/drivers/staging/iio/adc/ad7606_par.c
index d21218da923f..688632edd3d7 100644
--- a/trunk/drivers/staging/iio/adc/ad7606_par.c
+++ b/trunk/drivers/staging/iio/adc/ad7606_par.c
@@ -106,7 +106,7 @@ static int __devexit ad7606_par_remove(struct platform_device *pdev)
 	struct resource *res;
 	struct ad7606_state *st = iio_priv(indio_dev);
 
-	ad7606_remove(indio_dev);
+	ad7606_remove(indio_dev, platform_get_irq(pdev, 0));
 
 	iounmap(st->base_address);
 	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
diff --git a/trunk/drivers/staging/iio/adc/ad7606_spi.c b/trunk/drivers/staging/iio/adc/ad7606_spi.c
index 0769c807d95f..aede1ba5e041 100644
--- a/trunk/drivers/staging/iio/adc/ad7606_spi.c
+++ b/trunk/drivers/staging/iio/adc/ad7606_spi.c
@@ -59,7 +59,7 @@ static int __devexit ad7606_spi_remove(struct spi_device *spi)
 {
 	struct iio_dev *indio_dev = dev_get_drvdata(&spi->dev);
 
-	return ad7606_remove(indio_dev);
+	return ad7606_remove(indio_dev, spi->irq);
 }
 
 #ifdef CONFIG_PM