Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3b1cae7c authored by Lars-Peter Clausen's avatar Lars-Peter Clausen Committed by Jonathan Cameron
Browse files

staging:iio:ad7291: Move out of staging 



The ad7291 driver is in a reasonable shape. It does not use non-standard API/ABI
and there are no major style issues with the driver. So this patch moves it out
of staging.

There is one small warning from checkpatch which is also fixed in this patch.
The patch also sorts the #include directives in alphabetical order.

Signed-off-by: default avatarLars-Peter Clausen <lars@metafoo.de>
Signed-off-by: default avatarJonathan Cameron <jic23@kernel.org>
parent cfa71bf3

drivers/iio/adc/Kconfig

+10 −0
Original line number Diff line number Diff line
@@ -20,6 +20,16 @@ config AD7266 
	  Say yes here to build support for Analog Devices AD7265 and AD7266

	  ADCs.



config AD7291

	tristate "Analog Devices AD7291 ADC driver"

	depends on I2C

	help

	  Say yes here to build support for Analog Devices AD7291

	  8 Channel ADC with temperature sensor.



	  To compile this driver as a module, choose M here: the

	  module will be called ad7291.



config AD7298

	tristate "Analog Devices AD7298 ADC driver"

	depends on SPI

drivers/iio/adc/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ 
# When adding new entries keep the list in alphabetical order

obj-$(CONFIG_AD_SIGMA_DELTA) += ad_sigma_delta.o

obj-$(CONFIG_AD7266) += ad7266.o

obj-$(CONFIG_AD7291) += ad7291.o

obj-$(CONFIG_AD7298) += ad7298.o

obj-$(CONFIG_AD7923) += ad7923.o

obj-$(CONFIG_AD7476) += ad7476.o

drivers/staging/iio/adc/ad7291.c→drivers/iio/adc/ad7291.c

+7 −6
Original line number Diff line number Diff line
@@ -6,22 +6,22 @@ 
 * Licensed under the GPL-2 or later.

 */



#include <linux/interrupt.h>

#include <linux/device.h>

#include <linux/kernel.h>

#include <linux/slab.h>

#include <linux/sysfs.h>

#include <linux/err.h>

#include <linux/i2c.h>

#include <linux/interrupt.h>

#include <linux/kernel.h>

#include <linux/module.h>

#include <linux/mutex.h>

#include <linux/regulator/consumer.h>

#include <linux/err.h>

#include <linux/slab.h>

#include <linux/sysfs.h>



#include <linux/iio/iio.h>

#include <linux/iio/sysfs.h>

#include <linux/iio/events.h>



#include "ad7291.h"

#include <linux/platform_data/ad7291.h>



/*

 * Simplified handling
@@ -379,6 +379,7 @@ static int ad7291_read_raw(struct iio_dev *indio_dev, 
		case IIO_VOLTAGE:

			if (chip->reg) {

				int vref;



				vref = regulator_get_voltage(chip->reg);

				if (vref < 0)

					return vref;

drivers/staging/iio/adc/Kconfig

+0 −7
Original line number Diff line number Diff line
@@ -3,13 +3,6 @@ 
#

menu "Analog to digital converters"



config AD7291

	tristate "Analog Devices AD7291 ADC driver"

	depends on I2C

	help

	  Say yes here to build support for Analog Devices AD7291

	  8 Channel ADC with temperature sensor.



config AD7606

	tristate "Analog Devices AD7606 ADC driver"

	depends on GPIOLIB

drivers/staging/iio/adc/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -8,7 +8,6 @@ ad7606-$(CONFIG_AD7606_IFACE_PARALLEL) += ad7606_par.o 
ad7606-$(CONFIG_AD7606_IFACE_SPI) += ad7606_spi.o

obj-$(CONFIG_AD7606) += ad7606.o



obj-$(CONFIG_AD7291) += ad7291.o

obj-$(CONFIG_AD7780) += ad7780.o

obj-$(CONFIG_AD7816) += ad7816.o

obj-$(CONFIG_AD7192) += ad7192.o