Commit 3e2c96ea authored by Jonathan Cameron's avatar Jonathan Cameron Committed by Greg Kroah-Hartman

staging:iio: gpio build dependency fixing

Numerous drivers either had pointless includes of gpio.h
or should have been dependent on GENERIC_GPIO and were not.
Conversion of ads1210 to use array registration triggered
build failures that highlighted all was not well.
Signed-off-by: default avatarJonathan Cameron <jic23@cam.ac.uk>
Reported-by: default avatarRandy Dunlap <rdunlap@xenotime.net>
Acked-by: default avatarRandy Dunlap <rdunlap@xenotime.net>
Acked-by: default avatarMichael Hennerich <michael.hennerich@analog.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 41098f8f
...@@ -67,6 +67,7 @@ config LIS3L02DQ ...@@ -67,6 +67,7 @@ config LIS3L02DQ
depends on SPI depends on SPI
select IIO_TRIGGER if IIO_BUFFER select IIO_TRIGGER if IIO_BUFFER
depends on !IIO_BUFFER || IIO_KFIFO_BUF || IIO_SW_RING depends on !IIO_BUFFER || IIO_KFIFO_BUF || IIO_SW_RING
depends on GENERIC_GPIO
help help
Say yes here to build SPI support for the ST microelectronics Say yes here to build SPI support for the ST microelectronics
accelerometer. The driver supplies direct access via sysfs files accelerometer. The driver supplies direct access via sysfs files
......
...@@ -8,7 +8,6 @@ ...@@ -8,7 +8,6 @@
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/irq.h> #include <linux/irq.h>
#include <linux/gpio.h>
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/mutex.h> #include <linux/mutex.h>
#include <linux/device.h> #include <linux/device.h>
......
...@@ -11,7 +11,6 @@ ...@@ -11,7 +11,6 @@
*/ */
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/gpio.h>
#include <linux/fs.h> #include <linux/fs.h>
#include <linux/device.h> #include <linux/device.h>
#include <linux/slab.h> #include <linux/slab.h>
...@@ -1167,7 +1166,7 @@ static int __devinit sca3000_probe(struct spi_device *spi) ...@@ -1167,7 +1166,7 @@ static int __devinit sca3000_probe(struct spi_device *spi)
iio_scan_mask_set(indio_dev->buffer, 2); iio_scan_mask_set(indio_dev->buffer, 2);
} }
if (spi->irq && gpio_is_valid(irq_to_gpio(spi->irq)) > 0) { if (spi->irq) {
ret = request_threaded_irq(spi->irq, ret = request_threaded_irq(spi->irq,
NULL, NULL,
&sca3000_event_handler, &sca3000_event_handler,
...@@ -1184,7 +1183,7 @@ static int __devinit sca3000_probe(struct spi_device *spi) ...@@ -1184,7 +1183,7 @@ static int __devinit sca3000_probe(struct spi_device *spi)
return 0; return 0;
error_free_irq: error_free_irq:
if (spi->irq && gpio_is_valid(irq_to_gpio(spi->irq)) > 0) if (spi->irq)
free_irq(spi->irq, indio_dev); free_irq(spi->irq, indio_dev);
error_unregister_ring: error_unregister_ring:
iio_buffer_unregister(indio_dev); iio_buffer_unregister(indio_dev);
...@@ -1226,7 +1225,7 @@ static int sca3000_remove(struct spi_device *spi) ...@@ -1226,7 +1225,7 @@ static int sca3000_remove(struct spi_device *spi)
ret = sca3000_stop_all_interrupts(st); ret = sca3000_stop_all_interrupts(st);
if (ret) if (ret)
return ret; return ret;
if (spi->irq && gpio_is_valid(irq_to_gpio(spi->irq)) > 0) if (spi->irq)
free_irq(spi->irq, indio_dev); free_irq(spi->irq, indio_dev);
iio_buffer_unregister(indio_dev); iio_buffer_unregister(indio_dev);
sca3000_unconfigure_ring(indio_dev); sca3000_unconfigure_ring(indio_dev);
......
...@@ -150,6 +150,7 @@ config AD7746 ...@@ -150,6 +150,7 @@ config AD7746
config AD7816 config AD7816
tristate "Analog Devices AD7816/7/8 temperature sensor and ADC driver" tristate "Analog Devices AD7816/7/8 temperature sensor and ADC driver"
depends on SPI depends on SPI
depends on GENERIC_GPIO
help help
Say yes here to build support for Analog Devices AD7816/7/8 Say yes here to build support for Analog Devices AD7816/7/8
temperature sensors and ADC. temperature sensors and ADC.
......
...@@ -5,6 +5,7 @@ menu "Analog digital bi-direction convertors" ...@@ -5,6 +5,7 @@ menu "Analog digital bi-direction convertors"
config ADT7316 config ADT7316
tristate "Analog Devices ADT7316/7/8 ADT7516/7/9 temperature sensor, ADC and DAC driver" tristate "Analog Devices ADT7316/7/8 ADT7516/7/9 temperature sensor, ADC and DAC driver"
depends on GENERIC_GPIO
help help
Say yes here to build support for Analog Devices ADT7316, ADT7317, ADT7318 Say yes here to build support for Analog Devices ADT7316, ADT7317, ADT7318
and ADT7516, ADT7517, ADT7519 temperature sensors, ADC and DAC. and ADT7516, ADT7517, ADT7519 temperature sensors, ADC and DAC.
......
...@@ -7,7 +7,6 @@ ...@@ -7,7 +7,6 @@
*/ */
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/gpio.h>
#include <linux/fs.h> #include <linux/fs.h>
#include <linux/device.h> #include <linux/device.h>
#include <linux/kernel.h> #include <linux/kernel.h>
......
...@@ -7,7 +7,6 @@ ...@@ -7,7 +7,6 @@
*/ */
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/gpio.h>
#include <linux/fs.h> #include <linux/fs.h>
#include <linux/device.h> #include <linux/device.h>
#include <linux/kernel.h> #include <linux/kernel.h>
......
...@@ -7,7 +7,6 @@ ...@@ -7,7 +7,6 @@
*/ */
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/gpio.h>
#include <linux/fs.h> #include <linux/fs.h>
#include <linux/device.h> #include <linux/device.h>
#include <linux/module.h> #include <linux/module.h>
......
...@@ -7,7 +7,6 @@ ...@@ -7,7 +7,6 @@
*/ */
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/gpio.h>
#include <linux/fs.h> #include <linux/fs.h>
#include <linux/device.h> #include <linux/device.h>
#include <linux/kernel.h> #include <linux/kernel.h>
......
...@@ -5,7 +5,6 @@ ...@@ -5,7 +5,6 @@
* *
* Licensed under the GPL-2 or later. * Licensed under the GPL-2 or later.
*/ */
#include <linux/gpio.h>
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/mutex.h> #include <linux/mutex.h>
#include <linux/device.h> #include <linux/device.h>
......
...@@ -8,7 +8,6 @@ ...@@ -8,7 +8,6 @@
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/irq.h> #include <linux/irq.h>
#include <linux/gpio.h>
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/mutex.h> #include <linux/mutex.h>
#include <linux/device.h> #include <linux/device.h>
......
...@@ -8,7 +8,6 @@ ...@@ -8,7 +8,6 @@
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/irq.h> #include <linux/irq.h>
#include <linux/gpio.h>
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/mutex.h> #include <linux/mutex.h>
#include <linux/device.h> #include <linux/device.h>
......
...@@ -6,6 +6,7 @@ menu "Magnetometer sensors" ...@@ -6,6 +6,7 @@ menu "Magnetometer sensors"
config SENSORS_AK8975 config SENSORS_AK8975
tristate "Asahi Kasei AK8975 3-Axis Magnetometer" tristate "Asahi Kasei AK8975 3-Axis Magnetometer"
depends on I2C depends on I2C
depends on GENERIC_GPIO
help help
Say yes here to build support for Asahi Kasei AK8975 3-Axis Say yes here to build support for Asahi Kasei AK8975 3-Axis
Magnetometer. Magnetometer.
......
...@@ -8,7 +8,6 @@ ...@@ -8,7 +8,6 @@
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/irq.h> #include <linux/irq.h>
#include <linux/gpio.h>
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/mutex.h> #include <linux/mutex.h>
#include <linux/device.h> #include <linux/device.h>
......
...@@ -8,7 +8,6 @@ ...@@ -8,7 +8,6 @@
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/irq.h> #include <linux/irq.h>
#include <linux/gpio.h>
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/mutex.h> #include <linux/mutex.h>
#include <linux/device.h> #include <linux/device.h>
......
...@@ -8,7 +8,6 @@ ...@@ -8,7 +8,6 @@
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/irq.h> #include <linux/irq.h>
#include <linux/gpio.h>
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/mutex.h> #include <linux/mutex.h>
#include <linux/device.h> #include <linux/device.h>
......
...@@ -8,7 +8,6 @@ ...@@ -8,7 +8,6 @@
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/irq.h> #include <linux/irq.h>
#include <linux/gpio.h>
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/mutex.h> #include <linux/mutex.h>
#include <linux/device.h> #include <linux/device.h>
......
...@@ -8,7 +8,6 @@ ...@@ -8,7 +8,6 @@
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/irq.h> #include <linux/irq.h>
#include <linux/gpio.h>
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/mutex.h> #include <linux/mutex.h>
#include <linux/device.h> #include <linux/device.h>
......
...@@ -13,6 +13,7 @@ config AD2S90 ...@@ -13,6 +13,7 @@ config AD2S90
config AD2S1200 config AD2S1200
tristate "Analog Devices ad2s1200/ad2s1205 driver" tristate "Analog Devices ad2s1200/ad2s1205 driver"
depends on SPI depends on SPI
depends on GENERIC_GPIO
help help
Say yes here to build support for Analog Devices spi resolver Say yes here to build support for Analog Devices spi resolver
to digital converters, ad2s1200 and ad2s1205, provides direct access to digital converters, ad2s1200 and ad2s1205, provides direct access
...@@ -21,6 +22,7 @@ config AD2S1200 ...@@ -21,6 +22,7 @@ config AD2S1200
config AD2S1210 config AD2S1210
tristate "Analog Devices ad2s1210 driver" tristate "Analog Devices ad2s1210 driver"
depends on SPI depends on SPI
depends on GENERIC_GPIO
help help
Say yes here to build support for Analog Devices spi resolver Say yes here to build support for Analog Devices spi resolver
to digital converters, ad2s1210, provides direct access via sysfs. to digital converters, ad2s1210, provides direct access via sysfs.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment