diff options
-rw-r--r-- | drivers/staging/iio/impedance-analyzer/ad5933.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/drivers/staging/iio/impedance-analyzer/ad5933.c b/drivers/staging/iio/impedance-analyzer/ad5933.c index d0c89d0457de..9a6665dcf72b 100644 --- a/drivers/staging/iio/impedance-analyzer/ad5933.c +++ b/drivers/staging/iio/impedance-analyzer/ad5933.c | |||
@@ -115,6 +115,7 @@ static const struct iio_chan_spec ad5933_channels[] = { | |||
115 | .channel = 0, | 115 | .channel = 0, |
116 | .info_mask_separate = BIT(IIO_CHAN_INFO_PROCESSED), | 116 | .info_mask_separate = BIT(IIO_CHAN_INFO_PROCESSED), |
117 | .address = AD5933_REG_TEMP_DATA, | 117 | .address = AD5933_REG_TEMP_DATA, |
118 | .scan_index = -1, | ||
118 | .scan_type = { | 119 | .scan_type = { |
119 | .sign = 's', | 120 | .sign = 's', |
120 | .realbits = 14, | 121 | .realbits = 14, |
@@ -125,8 +126,6 @@ static const struct iio_chan_spec ad5933_channels[] = { | |||
125 | .indexed = 1, | 126 | .indexed = 1, |
126 | .channel = 0, | 127 | .channel = 0, |
127 | .extend_name = "real_raw", | 128 | .extend_name = "real_raw", |
128 | .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) | | ||
129 | BIT(IIO_CHAN_INFO_SCALE), | ||
130 | .address = AD5933_REG_REAL_DATA, | 129 | .address = AD5933_REG_REAL_DATA, |
131 | .scan_index = 0, | 130 | .scan_index = 0, |
132 | .scan_type = { | 131 | .scan_type = { |
@@ -139,8 +138,6 @@ static const struct iio_chan_spec ad5933_channels[] = { | |||
139 | .indexed = 1, | 138 | .indexed = 1, |
140 | .channel = 0, | 139 | .channel = 0, |
141 | .extend_name = "imag_raw", | 140 | .extend_name = "imag_raw", |
142 | .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) | | ||
143 | BIT(IIO_CHAN_INFO_SCALE), | ||
144 | .address = AD5933_REG_IMAG_DATA, | 141 | .address = AD5933_REG_IMAG_DATA, |
145 | .scan_index = 1, | 142 | .scan_index = 1, |
146 | .scan_type = { | 143 | .scan_type = { |
@@ -749,14 +746,14 @@ static int ad5933_probe(struct i2c_client *client, | |||
749 | indio_dev->name = id->name; | 746 | indio_dev->name = id->name; |
750 | indio_dev->modes = INDIO_DIRECT_MODE; | 747 | indio_dev->modes = INDIO_DIRECT_MODE; |
751 | indio_dev->channels = ad5933_channels; | 748 | indio_dev->channels = ad5933_channels; |
752 | indio_dev->num_channels = 1; /* only register temp0_input */ | 749 | indio_dev->num_channels = ARRAY_SIZE(ad5933_channels); |
753 | 750 | ||
754 | ret = ad5933_register_ring_funcs_and_init(indio_dev); | 751 | ret = ad5933_register_ring_funcs_and_init(indio_dev); |
755 | if (ret) | 752 | if (ret) |
756 | goto error_disable_reg; | 753 | goto error_disable_reg; |
757 | 754 | ||
758 | /* skip temp0_input, register in0_(real|imag)_raw */ | 755 | ret = iio_buffer_register(indio_dev, ad5933_channels, |
759 | ret = iio_buffer_register(indio_dev, &ad5933_channels[1], 2); | 756 | ARRAY_SIZE(ad5933_channels)); |
760 | if (ret) | 757 | if (ret) |
761 | goto error_unreg_ring; | 758 | goto error_unreg_ring; |
762 | 759 | ||