Commit 6835cb6b authored by Jonathan Cameron's avatar Jonathan Cameron Committed by Greg Kroah-Hartman
Browse files

staging:iio: unwind the IIO_IN -> IIO_VOLTAGE define 



This was originally there to avoid churn during a complex change.
Now everything is stable lets get rid of this as it is missleading
and confusing.

Signed-off-by: default avatarJonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 6519ad6e

drivers/staging/iio/accel/adis16201_core.c

+3 −3
Original line number Diff line number Diff line
@@ -325,7 +325,7 @@ static int adis16201_read_raw(struct iio_dev *indio_dev, 
	case (1 << IIO_CHAN_INFO_SCALE_SEPARATE):

	case (1 << IIO_CHAN_INFO_SCALE_SHARED):

		switch (chan->type) {

		case IIO_IN:

		case IIO_VOLTAGE:

			*val = 0;

			if (chan->channel == 0)

				*val2 = 1220;
@@ -407,7 +407,7 @@ static int adis16201_write_raw(struct iio_dev *indio_dev, 
}



static struct iio_chan_spec adis16201_channels[] = {

	IIO_CHAN(IIO_IN, 0, 1, 0, "supply", 0, 0,

	IIO_CHAN(IIO_VOLTAGE, 0, 1, 0, "supply", 0, 0,

		 (1 << IIO_CHAN_INFO_SCALE_SEPARATE),

		 in_supply, ADIS16201_SCAN_SUPPLY,

		 IIO_ST('u', 12, 16, 0), 0),
@@ -426,7 +426,7 @@ static struct iio_chan_spec adis16201_channels[] = { 
		 (1 << IIO_CHAN_INFO_CALIBBIAS_SEPARATE),

		 accel_y, ADIS16201_SCAN_ACC_Y,

		 IIO_ST('s', 14, 16, 0), 0),

	IIO_CHAN(IIO_IN, 0, 1, 0, NULL, 1, 0,

	IIO_CHAN(IIO_VOLTAGE, 0, 1, 0, NULL, 1, 0,

		 (1 << IIO_CHAN_INFO_SCALE_SEPARATE),

		 in_aux, ADIS16201_SCAN_AUX_ADC,

		 IIO_ST('u', 12, 16, 0), 0),

drivers/staging/iio/accel/adis16203_core.c

+3 −3
Original line number Diff line number Diff line
@@ -332,7 +332,7 @@ static int adis16203_read_raw(struct iio_dev *indio_dev, 
	case (1 << IIO_CHAN_INFO_SCALE_SEPARATE):

	case (1 << IIO_CHAN_INFO_SCALE_SHARED):

		switch (chan->type) {

		case IIO_IN:

		case IIO_VOLTAGE:

			*val = 0;

			if (chan->channel == 0)

				*val2 = 1220;
@@ -373,11 +373,11 @@ static int adis16203_read_raw(struct iio_dev *indio_dev, 
}



static struct iio_chan_spec adis16203_channels[] = {

	IIO_CHAN(IIO_IN, 0, 1, 0, "supply", 0, 0,

	IIO_CHAN(IIO_VOLTAGE, 0, 1, 0, "supply", 0, 0,

		 (1 << IIO_CHAN_INFO_SCALE_SEPARATE),

		 in_supply, ADIS16203_SCAN_SUPPLY,

		 IIO_ST('u', 12, 16, 0), 0),

	IIO_CHAN(IIO_IN, 0, 1, 0, NULL, 1, 0,

	IIO_CHAN(IIO_VOLTAGE, 0, 1, 0, NULL, 1, 0,

		 (1 << IIO_CHAN_INFO_SCALE_SEPARATE),

		 in_aux, ADIS16203_SCAN_AUX_ADC,

		 IIO_ST('u', 12, 16, 0), 0),

drivers/staging/iio/accel/adis16204_core.c

+3 −3
Original line number Diff line number Diff line
@@ -369,7 +369,7 @@ static int adis16204_read_raw(struct iio_dev *indio_dev, 
		return IIO_VAL_INT;

	case (1 << IIO_CHAN_INFO_SCALE_SEPARATE):

		switch (chan->type) {

		case IIO_IN:

		case IIO_VOLTAGE:

			*val = 0;

			if (chan->channel == 0)

				*val2 = 1220;
@@ -445,11 +445,11 @@ static int adis16204_write_raw(struct iio_dev *indio_dev, 
}



static struct iio_chan_spec adis16204_channels[] = {

	IIO_CHAN(IIO_IN, 0, 0, 0, "supply", 0, 0,

	IIO_CHAN(IIO_VOLTAGE, 0, 0, 0, "supply", 0, 0,

		 (1 << IIO_CHAN_INFO_SCALE_SEPARATE),

		 in_supply, ADIS16204_SCAN_SUPPLY,

		 IIO_ST('u', 12, 16, 0), 0),

	IIO_CHAN(IIO_IN, 0, 1, 0, NULL, 1, 0,

	IIO_CHAN(IIO_VOLTAGE, 0, 1, 0, NULL, 1, 0,

		 (1 << IIO_CHAN_INFO_SCALE_SEPARATE),

		 in_aux, ADIS16204_SCAN_AUX_ADC,

		 IIO_ST('u', 12, 16, 0), 0),

drivers/staging/iio/accel/adis16209_core.c

+3 −3
Original line number Diff line number Diff line
@@ -358,7 +358,7 @@ static int adis16209_read_raw(struct iio_dev *indio_dev, 
	case (1 << IIO_CHAN_INFO_SCALE_SEPARATE):

	case (1 << IIO_CHAN_INFO_SCALE_SHARED):

		switch (chan->type) {

		case IIO_IN:

		case IIO_VOLTAGE:

			*val = 0;

			if (chan->channel == 0)

				*val2 = 305180;
@@ -409,7 +409,7 @@ static int adis16209_read_raw(struct iio_dev *indio_dev, 
}



static struct iio_chan_spec adis16209_channels[] = {

	IIO_CHAN(IIO_IN, 0, 1, 0, NULL, 0, 0,

	IIO_CHAN(IIO_VOLTAGE, 0, 1, 0, NULL, 0, 0,

		 (1 << IIO_CHAN_INFO_SCALE_SEPARATE),

		 in_supply, ADIS16209_SCAN_SUPPLY,

		 IIO_ST('u', 14, 16, 0), 0),
@@ -428,7 +428,7 @@ static struct iio_chan_spec adis16209_channels[] = { 
		 (1 << IIO_CHAN_INFO_CALIBBIAS_SEPARATE),

		 accel_y, ADIS16209_SCAN_ACC_Y,

		 IIO_ST('s', 14, 16, 0), 0),

	IIO_CHAN(IIO_IN, 0, 1, 0, NULL, 1, 0,

	IIO_CHAN(IIO_VOLTAGE, 0, 1, 0, NULL, 1, 0,

		 (1 << IIO_CHAN_INFO_SCALE_SEPARATE),

		 in_aux, ADIS16209_SCAN_AUX_ADC,

		 IIO_ST('u', 12, 16, 0), 0),

drivers/staging/iio/accel/adis16220_core.c

+4 −4
Original line number Diff line number Diff line
@@ -529,7 +529,7 @@ static int adis16220_read_raw(struct iio_dev *indio_dev, 
		case IIO_ACCEL:

			*val2 = 1887042;

			return IIO_VAL_INT_PLUS_MICRO;

		case IIO_IN:

		case IIO_VOLTAGE:

			if (chan->channel == 0)

				*val2 = 0012221;

			else /* Should really be dependent on VDD */
@@ -571,7 +571,7 @@ static int adis16220_read_raw(struct iio_dev *indio_dev, 


static const struct iio_chan_spec adis16220_channels[] = {

	{

		.type = IIO_IN,

		.type = IIO_VOLTAGE,

		.indexed = 1,

		.channel = 0,

		.extend_name = "supply",
@@ -591,14 +591,14 @@ static const struct iio_chan_spec adis16220_channels[] = { 
			     (1 << IIO_CHAN_INFO_SCALE_SEPARATE),

		.address = temp,

	}, {

		.type = IIO_IN,

		.type = IIO_VOLTAGE,

		.indexed = 1,

		.channel = 1,

		.info_mask = (1 << IIO_CHAN_INFO_OFFSET_SEPARATE) |

			     (1 << IIO_CHAN_INFO_SCALE_SEPARATE),

		.address = in_1,

	}, {

		.type = IIO_IN,

		.type = IIO_VOLTAGE,

		.indexed = 1,

		.channel = 2,

		.address = in_2,

CRA Git | Maintained and supported by SUSTech CRA and CCSE