summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorJonathan Cameron2011-05-18 15:41:09 +0200
committerGreg Kroah-Hartman2011-05-20 01:06:14 +0200
commit4f2c1b02b9be473e7c458fc6bc7dc745203017f4 (patch)
tree20d416f274e51be941b4e46f7edd6029e7d7bda0 /drivers
parentstaging:iio:adc:ad7150 move from deprecated event handling plus remove irq as... (diff)
downloadkernel-qcow2-linux-4f2c1b02b9be473e7c458fc6bc7dc745203017f4.tar.gz
kernel-qcow2-linux-4f2c1b02b9be473e7c458fc6bc7dc745203017f4.tar.xz
kernel-qcow2-linux-4f2c1b02b9be473e7c458fc6bc7dc745203017f4.zip
staging:iio:adc:ad7152 remove unregister of interrupt line.
a) This interface is going away b) There is no matching register call so looks like a cut and paste error Trivial sparse warning fix. Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/staging/iio/adc/ad7152.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/drivers/staging/iio/adc/ad7152.c b/drivers/staging/iio/adc/ad7152.c
index 163c30767b06..25715f08055c 100644
--- a/drivers/staging/iio/adc/ad7152.c
+++ b/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);