diff options
author | Jonathan Cameron <jic23@cam.ac.uk> | 2011-09-27 09:56:41 +0100 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-09-29 17:32:07 -0700 |
commit | 6835cb6b438b77ba82ad5a23944bbfb12128f5db (patch) | |
tree | 39af808830417ce9eb4a8eeba4f92cfdaab5a6dd /drivers/staging/iio/accel/adis16220_core.c | |
parent | 6519ad6e6f92a4310fbaab50f074d5bbad27b329 (diff) | |
download | linux-3.10-6835cb6b438b77ba82ad5a23944bbfb12128f5db.tar.gz linux-3.10-6835cb6b438b77ba82ad5a23944bbfb12128f5db.tar.bz2 linux-3.10-6835cb6b438b77ba82ad5a23944bbfb12128f5db.zip |
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: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/iio/accel/adis16220_core.c')
-rw-r--r-- | drivers/staging/iio/accel/adis16220_core.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/staging/iio/accel/adis16220_core.c b/drivers/staging/iio/accel/adis16220_core.c index 18b0830b82f..15f5f301068 100644 --- a/drivers/staging/iio/accel/adis16220_core.c +++ b/drivers/staging/iio/accel/adis16220_core.c @@ -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, |