staging:iio: Move the ad7298 driver out of staging

The driver does not expose any custom API to userspace and none of the standard
static code checker tools report any issues, so move it out of staging.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>

6 files changed, 16 insertions, 17 deletions

diff --git a/drivers/iio/adc/Kconfig b/drivers/iio/adc/Kconfig
index ef5200a6850e..cd5eed60be28 100644
--- a/drivers/iio/adc/Kconfig
+++ b/drivers/iio/adc/Kconfig
@@ -18,6 +18,18 @@ config AD7266
           Say yes here to build support for Analog Devices AD7265 and AD7266
           ADCs.
 
+config AD7298
+        tristate "Analog Devices AD7298 ADC driver"
+        depends on SPI
+        select IIO_BUFFER
+        select IIO_TRIGGERED_BUFFER
+        help
+          Say yes here to build support for Analog Devices AD7298
+          8 Channel ADC with temperature sensor.
+
+          To compile this driver as a module, choose M here: the
+          module will be called ad7298.
+
 config AD7791
         tristate "Analog Devices AD7791 ADC driver"
         depends on SPI
diff --git a/drivers/iio/adc/Makefile b/drivers/iio/adc/Makefile
index 54ac7bbcd01b..3256dc64a466 100644
--- a/drivers/iio/adc/Makefile
+++ b/drivers/iio/adc/Makefile
@@ -4,6 +4,7 @@
 
 obj-$(CONFIG_AD_SIGMA_DELTA) += ad_sigma_delta.o
 obj-$(CONFIG_AD7266) += ad7266.o
+obj-$(CONFIG_AD7298) += ad7298.o
 obj-$(CONFIG_AD7476) += ad7476.o
 obj-$(CONFIG_AD7791) += ad7791.o
 obj-$(CONFIG_AD7887) += ad7887.o
diff --git a/drivers/staging/iio/adc/ad7298.c b/drivers/iio/adc/ad7298.c
index 2742a9de05db..441a9a265c12 100644
--- a/drivers/staging/iio/adc/ad7298.c
+++ b/drivers/iio/adc/ad7298.c
@@ -23,7 +23,7 @@
 #include <linux/iio/trigger_consumer.h>
 #include <linux/iio/triggered_buffer.h>
 
-#include "ad7298.h"
+#include <linux/platform_data/ad7298.h>
 
 #define AD7298_WRITE    (1 << 15) /* write to the control register */
 #define AD7298_REPEAT   (1 << 14) /* repeated conversion enable */
diff --git a/drivers/staging/iio/adc/Kconfig b/drivers/staging/iio/adc/Kconfig
index 5086a46b8e9a..dc8582b95b61 100644
--- a/drivers/staging/iio/adc/Kconfig
+++ b/drivers/staging/iio/adc/Kconfig
@@ -10,18 +10,6 @@ config AD7291
           Say yes here to build support for Analog Devices AD7291
           8 Channel ADC with temperature sensor.
 
-config AD7298
-        tristate "Analog Devices AD7298 ADC driver"
-        depends on SPI
-        select IIO_BUFFER
-        select IIO_TRIGGERED_BUFFER
-        help
-          Say yes here to build support for Analog Devices AD7298
-          8 Channel ADC with temperature sensor.
-
-          To compile this driver as a module, choose M here: the
-          module will be called ad7298.
-
 config AD7606
         tristate "Analog Devices AD7606 ADC driver"
         depends on GPIOLIB
diff --git a/drivers/staging/iio/adc/Makefile b/drivers/staging/iio/adc/Makefile
index 4beaa588256b..7281451a613a 100644
--- a/drivers/staging/iio/adc/Makefile
+++ b/drivers/staging/iio/adc/Makefile
@@ -12,8 +12,6 @@ ad799x-y := ad799x_core.o
 ad799x-$(CONFIG_AD799X_RING_BUFFER) += ad799x_ring.o
 obj-$(CONFIG_AD799X) += ad799x.o
 
-obj-$(CONFIG_AD7298) += ad7298.o
-
 obj-$(CONFIG_AD7291) += ad7291.o
 obj-$(CONFIG_AD7780) += ad7780.o
 obj-$(CONFIG_AD7793) += ad7793.o
diff --git a/drivers/staging/iio/adc/ad7298.h b/include/linux/platform_data/ad7298.h
index c8ac969ec016..fbf8adf1363a 100644
--- a/drivers/staging/iio/adc/ad7298.h
+++ b/include/linux/platform_data/ad7298.h
@@ -6,8 +6,8 @@
  * Licensed under the GPL-2.
  */
 
-#ifndef IIO_ADC_AD7298_H_
-#define IIO_ADC_AD7298_H_
+#ifndef __LINUX_PLATFORM_DATA_AD7298_H__
+#define __LINUX_PLATFORM_DATA_AD7298_H__
 
 /**
  * struct ad7298_platform_data - Platform data for the ad7298 ADC driver