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

Commit 44039a67 authored by Michael Hennerich's avatar Michael Hennerich Committed by Greg Kroah-Hartman
Browse files

staging:iio:adc: AD7606: Drop dev_data in favour of iio_priv() 



Some other small cleanups including excess header removals.

Signed-off-by: default avatarMichael Hennerich <michael.hennerich@analog.com>
Acked-by: default avatarJonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent b9c44515

drivers/staging/iio/adc/ad7606.h

+1 −1
Original line number Diff line number Diff line
@@ -109,7 +109,7 @@ enum ad7606_supported_device_ids { 
	ID_AD7606_4

};



int ad7606_scan_from_ring(struct ad7606_state *st, unsigned ch);

int ad7606_scan_from_ring(struct iio_dev *indio_dev, unsigned ch);

int ad7606_register_ring_funcs_and_init(struct iio_dev *indio_dev);

void ad7606_ring_cleanup(struct iio_dev *indio_dev);

#endif /* IIO_ADC_AD7606_H_ */

drivers/staging/iio/adc/ad7606_core.c

+10 −12
Original line number Diff line number Diff line
@@ -7,12 +7,10 @@ 
 */



#include <linux/interrupt.h>

#include <linux/workqueue.h>

#include <linux/device.h>

#include <linux/kernel.h>

#include <linux/slab.h>

#include <linux/sysfs.h>

#include <linux/list.h>

#include <linux/regulator/consumer.h>

#include <linux/err.h>

#include <linux/gpio.h>
@@ -38,8 +36,9 @@ int ad7606_reset(struct ad7606_state *st) 
	return -ENODEV;

}



static int ad7606_scan_direct(struct ad7606_state *st, unsigned ch)

static int ad7606_scan_direct(struct iio_dev *indio_dev, unsigned ch)

{

	struct ad7606_state *st = iio_priv(indio_dev);

	int ret;



	st->done = false;
@@ -85,16 +84,16 @@ static int ad7606_read_raw(struct iio_dev *indio_dev, 
			   long m)

{

	int ret;

	struct ad7606_state *st = indio_dev->dev_data;

	struct ad7606_state *st = iio_priv(indio_dev);

	unsigned int scale_uv;



	switch (m) {

	case 0:

		mutex_lock(&indio_dev->mlock);

		if (iio_ring_enabled(indio_dev))

			ret = ad7606_scan_from_ring(st, chan->address);

			ret = ad7606_scan_from_ring(indio_dev, chan->address);

		else

			ret = ad7606_scan_direct(st, chan->address);

			ret = ad7606_scan_direct(indio_dev, chan->address);

		mutex_unlock(&indio_dev->mlock);



		if (ret < 0)
@@ -115,7 +114,7 @@ static ssize_t ad7606_show_range(struct device *dev, 
			struct device_attribute *attr, char *buf)

{

	struct iio_dev *indio_dev = dev_get_drvdata(dev);

	struct ad7606_state *st = iio_dev_get_devdata(indio_dev);

	struct ad7606_state *st = iio_priv(indio_dev);



	return sprintf(buf, "%u\n", st->range);

}
@@ -124,7 +123,7 @@ static ssize_t ad7606_store_range(struct device *dev, 
		struct device_attribute *attr, const char *buf, size_t count)

{

	struct iio_dev *indio_dev = dev_get_drvdata(dev);

	struct ad7606_state *st = iio_dev_get_devdata(indio_dev);

	struct ad7606_state *st = iio_priv(indio_dev);

	unsigned long lval;



	if (strict_strtoul(buf, 10, &lval))
@@ -149,7 +148,7 @@ static ssize_t ad7606_show_oversampling_ratio(struct device *dev, 
			struct device_attribute *attr, char *buf)

{

	struct iio_dev *indio_dev = dev_get_drvdata(dev);

	struct ad7606_state *st = iio_dev_get_devdata(indio_dev);

	struct ad7606_state *st = iio_priv(indio_dev);



	return sprintf(buf, "%u\n", st->oversampling);

}
@@ -170,7 +169,7 @@ static ssize_t ad7606_store_oversampling_ratio(struct device *dev, 
		struct device_attribute *attr, const char *buf, size_t count)

{

	struct iio_dev *indio_dev = dev_get_drvdata(dev);

	struct ad7606_state *st = iio_dev_get_devdata(indio_dev);

	struct ad7606_state *st = iio_priv(indio_dev);

	unsigned long lval;

	int ret;
@@ -211,7 +210,7 @@ static mode_t ad7606_attr_is_visible(struct kobject *kobj, 
{

	struct device *dev = container_of(kobj, struct device, kobj);

	struct iio_dev *indio_dev = dev_get_drvdata(dev);

	struct ad7606_state *st = iio_dev_get_devdata(indio_dev);

	struct ad7606_state *st = iio_priv(indio_dev);



	mode_t mode = attr->mode;
@@ -472,7 +471,6 @@ struct iio_dev *ad7606_probe(struct device *dev, int irq, 


	indio_dev->dev.parent = dev;

	indio_dev->attrs = &ad7606_attribute_group;

	indio_dev->dev_data = (void *)(st);

	indio_dev->driver_module = THIS_MODULE;

	indio_dev->modes = INDIO_DIRECT_MODE;

	indio_dev->name = st->chip_info->name;

drivers/staging/iio/adc/ad7606_ring.c

+5 −6
Original line number Diff line number Diff line
@@ -7,7 +7,6 @@ 


#include <linux/interrupt.h>

#include <linux/gpio.h>

#include <linux/workqueue.h>

#include <linux/device.h>

#include <linux/kernel.h>

#include <linux/slab.h>
@@ -21,9 +20,9 @@ 


#include "ad7606.h"



int ad7606_scan_from_ring(struct ad7606_state *st, unsigned ch)

int ad7606_scan_from_ring(struct iio_dev *indio_dev, unsigned ch)

{

	struct iio_ring_buffer *ring = iio_priv_to_dev(st)->ring;

	struct iio_ring_buffer *ring = indio_dev->ring;

	int ret;

	u16 *ring_data;
@@ -54,7 +53,7 @@ int ad7606_scan_from_ring(struct ad7606_state *st, unsigned ch) 
 **/

static int ad7606_ring_preenable(struct iio_dev *indio_dev)

{

	struct ad7606_state *st = indio_dev->dev_data;

	struct ad7606_state *st = iio_priv(indio_dev);

	struct iio_ring_buffer *ring = indio_dev->ring;

	size_t d_size;
@@ -84,7 +83,7 @@ static irqreturn_t ad7606_trigger_handler_th_bh(int irq, void *p) 
{

	struct iio_poll_func *pf = p;

	struct iio_dev *indio_dev = pf->private_data;

	struct ad7606_state *st = indio_dev->dev_data;

	struct ad7606_state *st = iio_priv(indio_dev);



	gpio_set_value(st->pdata->gpio_convst, 1);
@@ -159,7 +158,7 @@ static const struct iio_ring_setup_ops ad7606_ring_setup_ops = { 


int ad7606_register_ring_funcs_and_init(struct iio_dev *indio_dev)

{

	struct ad7606_state *st = indio_dev->dev_data;

	struct ad7606_state *st = iio_priv(indio_dev);

	int ret;



	indio_dev->ring = iio_sw_rb_allocate(indio_dev);