diff options
author | Lars-Peter Clausen <lars@metafoo.de> | 2013-01-09 09:01:00 -0500 |
---|---|---|
committer | Jonathan Cameron <jic23@kernel.org> | 2013-01-26 05:30:23 -0500 |
commit | a9fbbee8a2e90f88ff605ec72b388ec20b808ee4 (patch) | |
tree | 6d903ed010abfe0c6aa15f55e0946bb864f3d2e2 /drivers | |
parent | 668cce24965a454f110c5835e0a2198a9aea55af (diff) |
staging:iio:adis16080: Move out of staging
The driver is rather simple and in a good shape. It follows the IIO ABI and the
standard codechecker tools do not report any issues, so move it out of staging.
While moving it also remove one outdated 'fixme' comment.
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/iio/gyro/Kconfig | 7 | ||||
-rw-r--r-- | drivers/iio/gyro/Makefile | 1 | ||||
-rw-r--r-- | drivers/iio/gyro/adis16080.c (renamed from drivers/staging/iio/gyro/adis16080_core.c) | 1 | ||||
-rw-r--r-- | drivers/staging/iio/gyro/Kconfig | 7 | ||||
-rw-r--r-- | drivers/staging/iio/gyro/Makefile | 3 |
5 files changed, 8 insertions, 11 deletions
diff --git a/drivers/iio/gyro/Kconfig b/drivers/iio/gyro/Kconfig index 96b68f63a902..752ac8a3448b 100644 --- a/drivers/iio/gyro/Kconfig +++ b/drivers/iio/gyro/Kconfig | |||
@@ -3,6 +3,13 @@ | |||
3 | # | 3 | # |
4 | menu "Digital gyroscope sensors" | 4 | menu "Digital gyroscope sensors" |
5 | 5 | ||
6 | config ADIS16080 | ||
7 | tristate "Analog Devices ADIS16080/100 Yaw Rate Gyroscope with SPI driver" | ||
8 | depends on SPI | ||
9 | help | ||
10 | Say yes here to build support for Analog Devices ADIS16080, ADIS16100 Yaw | ||
11 | Rate Gyroscope with SPI. | ||
12 | |||
6 | config ADIS16136 | 13 | config ADIS16136 |
7 | tristate "Analog devices ADIS16136 and similar gyroscopes driver" | 14 | tristate "Analog devices ADIS16136 and similar gyroscopes driver" |
8 | depends on SPI_MASTER | 15 | depends on SPI_MASTER |
diff --git a/drivers/iio/gyro/Makefile b/drivers/iio/gyro/Makefile index 702a058907e3..9b090ee084d3 100644 --- a/drivers/iio/gyro/Makefile +++ b/drivers/iio/gyro/Makefile | |||
@@ -2,5 +2,6 @@ | |||
2 | # Makefile for industrial I/O gyroscope sensor drivers | 2 | # Makefile for industrial I/O gyroscope sensor drivers |
3 | # | 3 | # |
4 | 4 | ||
5 | obj-$(CONFIG_ADIS16080) += adis16080.o | ||
5 | obj-$(CONFIG_ADIS16136) += adis16136.o | 6 | obj-$(CONFIG_ADIS16136) += adis16136.o |
6 | obj-$(CONFIG_HID_SENSOR_GYRO_3D) += hid-sensor-gyro-3d.o | 7 | obj-$(CONFIG_HID_SENSOR_GYRO_3D) += hid-sensor-gyro-3d.o |
diff --git a/drivers/staging/iio/gyro/adis16080_core.c b/drivers/iio/gyro/adis16080.c index 098a0a18ce2d..1861287911f1 100644 --- a/drivers/staging/iio/gyro/adis16080_core.c +++ b/drivers/iio/gyro/adis16080.c | |||
@@ -228,7 +228,6 @@ error_ret: | |||
228 | return ret; | 228 | return ret; |
229 | } | 229 | } |
230 | 230 | ||
231 | /* fixme, confirm ordering in this function */ | ||
232 | static int adis16080_remove(struct spi_device *spi) | 231 | static int adis16080_remove(struct spi_device *spi) |
233 | { | 232 | { |
234 | iio_device_unregister(spi_get_drvdata(spi)); | 233 | iio_device_unregister(spi_get_drvdata(spi)); |
diff --git a/drivers/staging/iio/gyro/Kconfig b/drivers/staging/iio/gyro/Kconfig index a439e0512d5a..658b3673d056 100644 --- a/drivers/staging/iio/gyro/Kconfig +++ b/drivers/staging/iio/gyro/Kconfig | |||
@@ -10,13 +10,6 @@ config ADIS16060 | |||
10 | Say yes here to build support for Analog Devices adis16060 wide bandwidth | 10 | Say yes here to build support for Analog Devices adis16060 wide bandwidth |
11 | yaw rate gyroscope with SPI. | 11 | yaw rate gyroscope with SPI. |
12 | 12 | ||
13 | config ADIS16080 | ||
14 | tristate "Analog Devices ADIS16080/100 Yaw Rate Gyroscope with SPI driver" | ||
15 | depends on SPI | ||
16 | help | ||
17 | Say yes here to build support for Analog Devices ADIS16080, ADIS16100 Yaw | ||
18 | Rate Gyroscope with SPI. | ||
19 | |||
20 | config ADIS16130 | 13 | config ADIS16130 |
21 | tristate "Analog Devices ADIS16130 High Precision Angular Rate Sensor driver" | 14 | tristate "Analog Devices ADIS16130 High Precision Angular Rate Sensor driver" |
22 | depends on SPI | 15 | depends on SPI |
diff --git a/drivers/staging/iio/gyro/Makefile b/drivers/staging/iio/gyro/Makefile index 79bef4ef7a54..ef3316171299 100644 --- a/drivers/staging/iio/gyro/Makefile +++ b/drivers/staging/iio/gyro/Makefile | |||
@@ -5,9 +5,6 @@ | |||
5 | adis16060-y := adis16060_core.o | 5 | adis16060-y := adis16060_core.o |
6 | obj-$(CONFIG_ADIS16060) += adis16060.o | 6 | obj-$(CONFIG_ADIS16060) += adis16060.o |
7 | 7 | ||
8 | adis16080-y := adis16080_core.o | ||
9 | obj-$(CONFIG_ADIS16080) += adis16080.o | ||
10 | |||
11 | adis16130-y := adis16130_core.o | 8 | adis16130-y := adis16130_core.o |
12 | obj-$(CONFIG_ADIS16130) += adis16130.o | 9 | obj-$(CONFIG_ADIS16130) += adis16130.o |
13 | 10 | ||