iio: cdc: ad7746: Move driver out of staging.

All known major issues with this driver resolved so time to move
it out of staging. This also allows us to remove the now empty
staging/iio/cdc directory and build files.

Note this cleanup work was done using the roadtest framework.
https://lore.kernel.org/all/20220311162445.346685-1-vincent.whitchurch@axis.com/

Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>

diff --git a/drivers/iio/cdc/Kconfig b/drivers/iio/cdc/Kconfig
index 5e3319a3ff48e5a6e7d3d71475e1a2b46efb9f7e..e0a5ce66a9845c37aa5c2a938a1d13d2a9de4de3 100644 (file)
--- a/drivers/iio/cdc/Kconfig
+++ b/drivers/iio/cdc/Kconfig
@@ -14,4 +14,14 @@ config AD7150
          To compile this driver as a module, choose M here: the
          module will be called ad7150.
 
+config AD7746
+       tristate "Analog Devices AD7745, AD7746 AD7747 capacitive sensor driver"
+       depends on I2C
+       help
+         Say yes here to build support for Analog Devices capacitive sensors.
+         (AD7745, AD7746, AD7747) Provides direct access via sysfs.
+
+         To compile this driver as a module, choose M here: the
+         module will be called ad7746.
+
 endmenu

diff --git a/drivers/iio/cdc/Makefile b/drivers/iio/cdc/Makefile
index ee490637b032516094622cc98464ab6e07e72003..41db756d80201ffc21bee947cf2ed309bd3fdd15 100644 (file)
--- a/drivers/iio/cdc/Makefile
+++ b/drivers/iio/cdc/Makefile
@@ -4,3 +4,4 @@
 #
 
 obj-$(CONFIG_AD7150) += ad7150.o
+obj-$(CONFIG_AD7746) += ad7746.o

diff --git a/drivers/staging/iio/cdc/ad7746.c b/drivers/iio/cdc/ad7746.c
similarity index 100%
rename from drivers/staging/iio/cdc/ad7746.c
rename to drivers/iio/cdc/ad7746.c

diff --git a/drivers/staging/iio/Kconfig b/drivers/staging/iio/Kconfig
index a8e970db179deb48d84c23e8523170d2eb0c2269..afd05bf3345ee1b74175d558006d0ed762269251 100644 (file)
--- a/drivers/staging/iio/Kconfig
+++ b/drivers/staging/iio/Kconfig
@@ -8,7 +8,6 @@ menu "IIO staging drivers"
 source "drivers/staging/iio/accel/Kconfig"
 source "drivers/staging/iio/adc/Kconfig"
 source "drivers/staging/iio/addac/Kconfig"
-source "drivers/staging/iio/cdc/Kconfig"
 source "drivers/staging/iio/frequency/Kconfig"
 source "drivers/staging/iio/impedance-analyzer/Kconfig"
 source "drivers/staging/iio/meter/Kconfig"

diff --git a/drivers/staging/iio/Makefile b/drivers/staging/iio/Makefile
index b15904b99581843398f07626ae572c38fe785333..5ed56fe57e14cf5f2d3cfe34a51a31c1f6c334f8 100644 (file)
--- a/drivers/staging/iio/Makefile
+++ b/drivers/staging/iio/Makefile
@@ -6,7 +6,6 @@
 obj-y += accel/
 obj-y += adc/
 obj-y += addac/
-obj-y += cdc/
 obj-y += frequency/
 obj-y += impedance-analyzer/
 obj-y += meter/

diff --git a/drivers/staging/iio/cdc/Kconfig b/drivers/staging/iio/cdc/Kconfig
deleted file mode 100644 (file)
index a7386bb..0000000
--- a/drivers/staging/iio/cdc/Kconfig
+++ /dev/null
@@ -1,17 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0
-#
-# CDC drivers
-#
-menu "Capacitance to digital converters"
-
-config AD7746
-       tristate "Analog Devices AD7745, AD7746 AD7747 capacitive sensor driver"
-       depends on I2C
-       help
-         Say yes here to build support for Analog Devices capacitive sensors.
-         (AD7745, AD7746, AD7747) Provides direct access via sysfs.
-
-         To compile this driver as a module, choose M here: the
-         module will be called ad7746.
-
-endmenu

diff --git a/drivers/staging/iio/cdc/Makefile b/drivers/staging/iio/cdc/Makefile
deleted file mode 100644 (file)
index afb7499..0000000
--- a/drivers/staging/iio/cdc/Makefile
+++ /dev/null
@@ -1,6 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0
-#
-# Makefile for industrial I/O CDC drivers
-#
-
-obj-$(CONFIG_AD7746) += ad7746.o