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

Commit 84f79ecb authored by Jonathan Cameron's avatar Jonathan Cameron Committed by Greg Kroah-Hartman
Browse files

staging:iio:adc:naming: dev_info to indio_dev for consistency 



We had a random missmatch of these two.  Lets pick the most common
and get rid of the other.

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

drivers/staging/iio/adc/ad7150.c

+2 −2
Original line number Diff line number Diff line
@@ -341,8 +341,8 @@ static ssize_t ad7150_show_timeout(struct device *dev, 
				   struct device_attribute *attr,

				   char *buf)

{

	struct iio_dev *dev_info = dev_get_drvdata(dev);

	struct ad7150_chip_info *chip = iio_priv(dev_info);

	struct iio_dev *indio_dev = dev_get_drvdata(dev);

	struct ad7150_chip_info *chip = iio_priv(indio_dev);

	struct iio_dev_attr *this_attr = to_iio_dev_attr(attr);

	u8 value;

drivers/staging/iio/adc/ad7192.c

+2 −2
Original line number Diff line number Diff line
@@ -842,8 +842,8 @@ static mode_t ad7192_attr_is_visible(struct kobject *kobj, 
				     struct attribute *attr, int n)

{

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

	struct iio_dev *dev_info = dev_get_drvdata(dev);

	struct ad7192_state *st = iio_priv(dev_info);

	struct iio_dev *indio_dev = dev_get_drvdata(dev);

	struct ad7192_state *st = iio_priv(indio_dev);



	mode_t mode = attr->mode;

drivers/staging/iio/adc/ad7280a.c

+30 −30
Original line number Diff line number Diff line
@@ -383,8 +383,8 @@ static ssize_t ad7280_show_balance_sw(struct device *dev, 
					struct device_attribute *attr,

					char *buf)

{

	struct iio_dev *dev_info = dev_get_drvdata(dev);

	struct ad7280_state *st = iio_priv(dev_info);

	struct iio_dev *indio_dev = dev_get_drvdata(dev);

	struct ad7280_state *st = iio_priv(indio_dev);

	struct iio_dev_attr *this_attr = to_iio_dev_attr(attr);



	return sprintf(buf, "%d\n",
@@ -397,8 +397,8 @@ static ssize_t ad7280_store_balance_sw(struct device *dev, 
					 const char *buf,

					 size_t len)

{

	struct iio_dev *dev_info = dev_get_drvdata(dev);

	struct ad7280_state *st = iio_priv(dev_info);

	struct iio_dev *indio_dev = dev_get_drvdata(dev);

	struct ad7280_state *st = iio_priv(indio_dev);

	struct iio_dev_attr *this_attr = to_iio_dev_attr(attr);

	bool readin;

	int ret;
@@ -411,7 +411,7 @@ static ssize_t ad7280_store_balance_sw(struct device *dev, 
	devaddr = this_attr->address >> 8;

	ch = this_attr->address & 0xFF;



	mutex_lock(&dev_info->mlock);

	mutex_lock(&indio_dev->mlock);

	if (readin)

		st->cb_mask[devaddr] |= 1 << (ch + 2);

	else
@@ -419,7 +419,7 @@ static ssize_t ad7280_store_balance_sw(struct device *dev, 


	ret = ad7280_write(st, devaddr, AD7280A_CELL_BALANCE,

			   0, st->cb_mask[devaddr]);

	mutex_unlock(&dev_info->mlock);

	mutex_unlock(&indio_dev->mlock);



	return ret ? ret : len;

}
@@ -428,16 +428,16 @@ static ssize_t ad7280_show_balance_timer(struct device *dev, 
					struct device_attribute *attr,

					char *buf)

{

	struct iio_dev *dev_info = dev_get_drvdata(dev);

	struct ad7280_state *st = iio_priv(dev_info);

	struct iio_dev *indio_dev = dev_get_drvdata(dev);

	struct ad7280_state *st = iio_priv(indio_dev);

	struct iio_dev_attr *this_attr = to_iio_dev_attr(attr);

	int ret;

	unsigned msecs;



	mutex_lock(&dev_info->mlock);

	mutex_lock(&indio_dev->mlock);

	ret = ad7280_read(st, this_attr->address >> 8,

			this_attr->address & 0xFF);

	mutex_unlock(&dev_info->mlock);

	mutex_unlock(&indio_dev->mlock);



	if (ret < 0)

		return ret;
@@ -452,8 +452,8 @@ static ssize_t ad7280_store_balance_timer(struct device *dev, 
					 const char *buf,

					 size_t len)

{

	struct iio_dev *dev_info = dev_get_drvdata(dev);

	struct ad7280_state *st = iio_priv(dev_info);

	struct iio_dev *indio_dev = dev_get_drvdata(dev);

	struct ad7280_state *st = iio_priv(indio_dev);

	struct iio_dev_attr *this_attr = to_iio_dev_attr(attr);

	long val;

	int ret;
@@ -467,11 +467,11 @@ static ssize_t ad7280_store_balance_timer(struct device *dev, 
	if (val > 31)

		return -EINVAL;



	mutex_lock(&dev_info->mlock);

	mutex_lock(&indio_dev->mlock);

	ret = ad7280_write(st, this_attr->address >> 8,

			   this_attr->address & 0xFF,

			   0, (val & 0x1F) << 3);

	mutex_unlock(&dev_info->mlock);

	mutex_unlock(&indio_dev->mlock);



	return ret ? ret : len;

}
@@ -595,8 +595,8 @@ static ssize_t ad7280_read_channel_config(struct device *dev, 
					struct device_attribute *attr,

					char *buf)

{

	struct iio_dev *dev_info = dev_get_drvdata(dev);

	struct ad7280_state *st = iio_priv(dev_info);

	struct iio_dev *indio_dev = dev_get_drvdata(dev);

	struct ad7280_state *st = iio_priv(indio_dev);

	struct iio_dev_attr *this_attr = to_iio_dev_attr(attr);

	unsigned val;
@@ -625,8 +625,8 @@ static ssize_t ad7280_write_channel_config(struct device *dev, 
					 const char *buf,

					 size_t len)

{

	struct iio_dev *dev_info = dev_get_drvdata(dev);

	struct ad7280_state *st = iio_priv(dev_info);

	struct iio_dev *indio_dev = dev_get_drvdata(dev);

	struct ad7280_state *st = iio_priv(indio_dev);

	struct iio_dev_attr *this_attr = to_iio_dev_attr(attr);



	long val;
@@ -651,7 +651,7 @@ static ssize_t ad7280_write_channel_config(struct device *dev, 


	val = clamp(val, 0L, 0xFFL);



	mutex_lock(&dev_info->mlock);

	mutex_lock(&indio_dev->mlock);

	switch (this_attr->address) {

	case AD7280A_CELL_OVERVOLTAGE:

		st->cell_threshhigh = val;
@@ -670,15 +670,15 @@ static ssize_t ad7280_write_channel_config(struct device *dev, 
	ret = ad7280_write(st, AD7280A_DEVADDR_MASTER,

			   this_attr->address, 1, val);



	mutex_unlock(&dev_info->mlock);

	mutex_unlock(&indio_dev->mlock);



	return ret ? ret : len;

}



static irqreturn_t ad7280_event_handler(int irq, void *private)

{

	struct iio_dev *dev_info = private;

	struct ad7280_state *st = iio_priv(dev_info);

	struct iio_dev *indio_dev = private;

	struct ad7280_state *st = iio_priv(indio_dev);

	unsigned *channels;

	int i, ret;
@@ -694,7 +694,7 @@ static irqreturn_t ad7280_event_handler(int irq, void *private) 
		if (((channels[i] >> 23) & 0xF) <= AD7280A_CELL_VOLTAGE_6) {

			if (((channels[i] >> 11) & 0xFFF) >=

				st->cell_threshhigh)

				iio_push_event(dev_info,

				iio_push_event(indio_dev,

					IIO_EVENT_CODE(IIO_VOLTAGE,

						       1,

						       0,
@@ -704,7 +704,7 @@ static irqreturn_t ad7280_event_handler(int irq, void *private) 
					iio_get_time_ns());

			else if (((channels[i] >> 11) & 0xFFF) <=

				st->cell_threshlow)

				iio_push_event(dev_info,

				iio_push_event(indio_dev,

					IIO_EVENT_CODE(IIO_VOLTAGE,

						       1,

						       0,
@@ -714,7 +714,7 @@ static irqreturn_t ad7280_event_handler(int irq, void *private) 
					iio_get_time_ns());

		} else {

			if (((channels[i] >> 11) & 0xFFF) >= st->aux_threshhigh)

				iio_push_event(dev_info,

				iio_push_event(indio_dev,

					IIO_UNMOD_EVENT_CODE(IIO_TEMP,

					0,

					IIO_EV_TYPE_THRESH,
@@ -722,7 +722,7 @@ static irqreturn_t ad7280_event_handler(int irq, void *private) 
					iio_get_time_ns());

			else if (((channels[i] >> 11) & 0xFFF) <=

				st->aux_threshlow)

				iio_push_event(dev_info,

				iio_push_event(indio_dev,

					IIO_UNMOD_EVENT_CODE(IIO_TEMP,

					0,

					IIO_EV_TYPE_THRESH,
@@ -775,25 +775,25 @@ static struct attribute_group ad7280_event_attrs_group = { 
	.attrs = ad7280_event_attributes,

};



static int ad7280_read_raw(struct iio_dev *dev_info,

static int ad7280_read_raw(struct iio_dev *indio_dev,

			   struct iio_chan_spec const *chan,

			   int *val,

			   int *val2,

			   long m)

{

	struct ad7280_state *st = iio_priv(dev_info);

	struct ad7280_state *st = iio_priv(indio_dev);

	unsigned int scale_uv;

	int ret;



	switch (m) {

	case 0:

		mutex_lock(&dev_info->mlock);

		mutex_lock(&indio_dev->mlock);

		if (chan->address == AD7280A_ALL_CELLS)

			ret = ad7280_read_all_channels(st, st->scan_cnt, NULL);

		else

			ret = ad7280_read_channel(st, chan->address >> 8,

						  chan->address & 0xFF);

		mutex_unlock(&dev_info->mlock);

		mutex_unlock(&indio_dev->mlock);



		if (ret < 0)

			return ret;

drivers/staging/iio/adc/ad7291.c

+6 −6
Original line number Diff line number Diff line
@@ -131,8 +131,8 @@ static ssize_t ad7291_store_reset(struct device *dev, 
		const char *buf,

		size_t len)

{

	struct iio_dev *dev_info = dev_get_drvdata(dev);

	struct ad7291_chip_info *chip = iio_priv(dev_info);

	struct iio_dev *indio_dev = dev_get_drvdata(dev);

	struct ad7291_chip_info *chip = iio_priv(indio_dev);



	return ad7291_i2c_write(chip, AD7291_COMMAND,

				chip->command | AD7291_RESET);
@@ -213,8 +213,8 @@ static inline ssize_t ad7291_show_hyst(struct device *dev, 
		struct device_attribute *attr,

		char *buf)

{

	struct iio_dev *dev_info = dev_get_drvdata(dev);

	struct ad7291_chip_info *chip = iio_priv(dev_info);

	struct iio_dev *indio_dev = dev_get_drvdata(dev);

	struct ad7291_chip_info *chip = iio_priv(indio_dev);

	struct iio_dev_attr *this_attr = to_iio_dev_attr(attr);

	u16 data;

	int ret;
@@ -231,8 +231,8 @@ static inline ssize_t ad7291_set_hyst(struct device *dev, 
				      const char *buf,

				      size_t len)

{

	struct iio_dev *dev_info = dev_get_drvdata(dev);

	struct ad7291_chip_info *chip = iio_priv(dev_info);

	struct iio_dev *indio_dev = dev_get_drvdata(dev);

	struct ad7291_chip_info *chip = iio_priv(indio_dev);

	struct iio_dev_attr *this_attr = to_iio_dev_attr(attr);

	u16 data;

	int ret;

drivers/staging/iio/adc/ad7298_core.c

+6 −6
Original line number Diff line number Diff line
@@ -109,24 +109,24 @@ static int ad7298_scan_temp(struct ad7298_state *st, int *val) 
	return 0;

}



static int ad7298_read_raw(struct iio_dev *dev_info,

static int ad7298_read_raw(struct iio_dev *indio_dev,

			   struct iio_chan_spec const *chan,

			   int *val,

			   int *val2,

			   long m)

{

	int ret;

	struct ad7298_state *st = iio_priv(dev_info);

	struct ad7298_state *st = iio_priv(indio_dev);

	unsigned int scale_uv;



	switch (m) {

	case 0:

		mutex_lock(&dev_info->mlock);

		if (iio_buffer_enabled(dev_info)) {

		mutex_lock(&indio_dev->mlock);

		if (iio_buffer_enabled(indio_dev)) {

			if (chan->address == AD7298_CH_TEMP)

				ret = -ENODEV;

			else

				ret = ad7298_scan_from_ring(dev_info,

				ret = ad7298_scan_from_ring(indio_dev,

							    chan->address);

		} else {

			if (chan->address == AD7298_CH_TEMP)
@@ -134,7 +134,7 @@ static int ad7298_read_raw(struct iio_dev *dev_info, 
			else

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

		}

		mutex_unlock(&dev_info->mlock);

		mutex_unlock(&indio_dev->mlock);



		if (ret < 0)

			return ret;