From eb81f9d35f18fc54c687eec03a053075d002933a Mon Sep 17 00:00:00 2001
From: Lars-Peter Clausen <lars@metafoo.de>
Date: Fri, 15 Jun 2012 18:14:36 +0200
Subject: [PATCH] --- yaml --- r: 317391 b: refs/heads/master c:
 eaedfa54db0584ddf7308bb99c473cc6cf28fb65 h: refs/heads/master i:   317389:
 33de1f63c8006827b954f6e7b2ad3f4a31f575d7   317387:
 0ea6add9a37f7076ed5b0908e9ab94df7369ec48   317383:
 778cf0204c2f13b743b48dbbc1026618be6cec88   317375:
 e1d92aeffa1ef1d5ab4a1f478d0b985fcd8d633a v: v3

---
 [refs]                                           | 2 +-
 trunk/drivers/staging/iio/accel/adis16209_core.c | 2 --
 trunk/drivers/staging/iio/accel/adis16220_core.c | 2 --
 trunk/drivers/staging/iio/accel/adis16240_core.c | 2 --
 trunk/drivers/staging/iio/gyro/adis16260_core.c  | 2 --
 5 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index e07062953b03..7c921f59c294 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 25c38aa3d17d6ccfca225fafce68401908a1ccb4
+refs/heads/master: eaedfa54db0584ddf7308bb99c473cc6cf28fb65
diff --git a/trunk/drivers/staging/iio/accel/adis16209_core.c b/trunk/drivers/staging/iio/accel/adis16209_core.c
index f6fd0d31d4f0..6fc426e27e4e 100644
--- a/trunk/drivers/staging/iio/accel/adis16209_core.c
+++ b/trunk/drivers/staging/iio/accel/adis16209_core.c
@@ -606,8 +606,6 @@ static int adis16209_remove(struct spi_device *spi)
 {
 	struct iio_dev *indio_dev = spi_get_drvdata(spi);
 
-	flush_scheduled_work();
-
 	iio_device_unregister(indio_dev);
 	adis16209_remove_trigger(indio_dev);
 	iio_buffer_unregister(indio_dev);
diff --git a/trunk/drivers/staging/iio/accel/adis16220_core.c b/trunk/drivers/staging/iio/accel/adis16220_core.c
index 6a9ac898cb01..af5c57637166 100644
--- a/trunk/drivers/staging/iio/accel/adis16220_core.c
+++ b/trunk/drivers/staging/iio/accel/adis16220_core.c
@@ -694,8 +694,6 @@ static int adis16220_remove(struct spi_device *spi)
 {
 	struct iio_dev *indio_dev = spi_get_drvdata(spi);
 
-	flush_scheduled_work();
-
 	sysfs_remove_bin_file(&indio_dev->dev.kobj, &adc2_bin);
 	sysfs_remove_bin_file(&indio_dev->dev.kobj, &adc1_bin);
 	sysfs_remove_bin_file(&indio_dev->dev.kobj, &accel_bin);
diff --git a/trunk/drivers/staging/iio/accel/adis16240_core.c b/trunk/drivers/staging/iio/accel/adis16240_core.c
index 8b15eaea3381..2f59f83d002d 100644
--- a/trunk/drivers/staging/iio/accel/adis16240_core.c
+++ b/trunk/drivers/staging/iio/accel/adis16240_core.c
@@ -641,8 +641,6 @@ static int adis16240_remove(struct spi_device *spi)
 
 	struct iio_dev *indio_dev = spi_get_drvdata(spi);
 
-	flush_scheduled_work();
-
 	iio_device_unregister(indio_dev);
 	adis16240_remove_trigger(indio_dev);
 	iio_buffer_unregister(indio_dev);
diff --git a/trunk/drivers/staging/iio/gyro/adis16260_core.c b/trunk/drivers/staging/iio/gyro/adis16260_core.c
index ec765f955f8d..fdb84cc3d7c9 100644
--- a/trunk/drivers/staging/iio/gyro/adis16260_core.c
+++ b/trunk/drivers/staging/iio/gyro/adis16260_core.c
@@ -728,8 +728,6 @@ static int adis16260_remove(struct spi_device *spi)
 	if (ret)
 		goto err_ret;
 
-	flush_scheduled_work();
-
 	adis16260_remove_trigger(indio_dev);
 	iio_buffer_unregister(indio_dev);
 	adis16260_unconfigure_ring(indio_dev);