From b1bfc1d4823be73d9b10bf4886074e9d660f149b Mon Sep 17 00:00:00 2001
From: Jonathan Cameron <jic23@cam.ac.uk>
Date: Wed, 18 May 2011 14:41:09 +0100
Subject: [PATCH] --- yaml --- r: 249783 b: refs/heads/master c:
 4f2c1b02b9be473e7c458fc6bc7dc745203017f4 h: refs/heads/master i:   249781:
 30c361c2a2ba09573ea397e9f665b42812d49d5f   249779:
 6a2a05484e4351c7a0325bab903482705cbc1f8e   249775:
 68dca9bf5aa50c0ad65e04cce0665f6e24985207 v: v3

---
 [refs]                                 | 2 +-
 trunk/drivers/staging/iio/adc/ad7152.c | 9 ++-------
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 323982733ff4..d7d48873f18c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9b5d9b06a4ae41705f856b68ccac507219250de6
+refs/heads/master: 4f2c1b02b9be473e7c458fc6bc7dc745203017f4
diff --git a/trunk/drivers/staging/iio/adc/ad7152.c b/trunk/drivers/staging/iio/adc/ad7152.c
index 163c30767b06..25715f08055c 100644
--- a/trunk/drivers/staging/iio/adc/ad7152.c
+++ b/trunk/drivers/staging/iio/adc/ad7152.c
@@ -7,15 +7,11 @@
  */
 
 #include <linux/interrupt.h>
-#include <linux/gpio.h>
-#include <linux/workqueue.h>
 #include <linux/device.h>
 #include <linux/kernel.h>
 #include <linux/slab.h>
 #include <linux/sysfs.h>
-#include <linux/list.h>
 #include <linux/i2c.h>
-#include <linux/rtc.h>
 
 #include "../iio.h"
 #include "../sysfs.h"
@@ -72,7 +68,8 @@ struct ad7152_conversion_mode {
 	u8 reg_cfg;
 };
 
-struct ad7152_conversion_mode ad7152_conv_mode_table[AD7152_MAX_CONV_MODE] = {
+static struct ad7152_conversion_mode
+ad7152_conv_mode_table[AD7152_MAX_CONV_MODE] = {
 	{ "idle", 0 },
 	{ "continuous-conversion", 1 },
 	{ "single-conversion", 2 },
@@ -567,8 +564,6 @@ static int __devexit ad7152_remove(struct i2c_client *client)
 	struct ad7152_chip_info *chip = i2c_get_clientdata(client);
 	struct iio_dev *indio_dev = chip->indio_dev;
 
-	if (client->irq && gpio_is_valid(irq_to_gpio(client->irq)) > 0)
-		iio_unregister_interrupt_line(indio_dev, 0);
 	iio_device_unregister(indio_dev);
 	kfree(chip);