3.2.65-rc1 review patch.  If anyone has any objections, please let me know.

------------------

From: Lars-Peter Clausen <l...@metafoo.de>

commit 6822ee34ad57b29a3b44df2c2829910f03c34fa4 upstream.

"raw" is the name of a channel property, but should not be part of the
channel name itself.

Signed-off-by: Lars-Peter Clausen <l...@metafoo.de>
Signed-off-by: Jonathan Cameron <ji...@kernel.org>
[bwh: Backported to 3.2: using IIO_CHAN() macro to initialise the structures]
Signed-off-by: Ben Hutchings <b...@decadent.org.uk>
---
 drivers/staging/iio/impedance-analyzer/ad5933.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- a/drivers/staging/iio/impedance-analyzer/ad5933.c
+++ b/drivers/staging/iio/impedance-analyzer/ad5933.c
@@ -112,10 +112,10 @@ static struct iio_chan_spec ad5933_chann
        IIO_CHAN(IIO_TEMP, 0, 1, 1, NULL, 0, 0, 0,
                 0, AD5933_REG_TEMP_DATA, IIO_ST('s', 14, 16, 0), 0),
        /* Ring Channels */
-       IIO_CHAN(IIO_VOLTAGE, 0, 1, 0, "real_raw", 0, 0,
+       IIO_CHAN(IIO_VOLTAGE, 0, 1, 0, "real", 0, 0,
                 (1 << IIO_CHAN_INFO_SCALE_SEPARATE),
                 AD5933_REG_REAL_DATA, 0, IIO_ST('s', 16, 16, 0), 0),
-       IIO_CHAN(IIO_VOLTAGE, 0, 1, 0, "imag_raw", 0, 0,
+       IIO_CHAN(IIO_VOLTAGE, 0, 1, 0, "imag", 0, 0,
                 (1 << IIO_CHAN_INFO_SCALE_SEPARATE),
                 AD5933_REG_IMAG_DATA, 1, IIO_ST('s', 16, 16, 0), 0),
 };

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to