diff options
| author | Marek Vasut <marex@denx.de> | 2013-07-03 17:25:00 -0400 |
|---|---|---|
| committer | Jonathan Cameron <jic23@kernel.org> | 2013-07-06 05:34:51 -0400 |
| commit | 2a961d0995cdadbfba565b28beada59c5ae7ebae (patch) | |
| tree | 370204d8dd4d0b59eb115d28724bba78898cdc32 | |
| parent | e1b1fa66a0398f0b52ae79a2bdc7de87c205d074 (diff) | |
iio: mxs-lradc: Remove useless check in read_raw
The removed check in the read_raw implementation was always true,
therefore remove it. This also fixes a bug, by closely inspecting
the code, one can notice the iio_validate_scan_mask_onehot() will
always return 1 and therefore the subsequent condition will always
succeed, therefore making the mxs_lradc_read_raw() function always
return -EINVAL; .
Signed-off-by: Marek Vasut <marex@denx.de>
Tested-by: Otavio Salvador <otavio@ossystems.com.br>
Acked-by: Hector Palacios <hector.palacios@digi.com>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
| -rw-r--r-- | drivers/staging/iio/adc/mxs-lradc.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/drivers/staging/iio/adc/mxs-lradc.c b/drivers/staging/iio/adc/mxs-lradc.c index c5edf1cad07a..9f52a2857929 100644 --- a/drivers/staging/iio/adc/mxs-lradc.c +++ b/drivers/staging/iio/adc/mxs-lradc.c | |||
| @@ -234,7 +234,6 @@ static int mxs_lradc_read_raw(struct iio_dev *iio_dev, | |||
| 234 | { | 234 | { |
| 235 | struct mxs_lradc *lradc = iio_priv(iio_dev); | 235 | struct mxs_lradc *lradc = iio_priv(iio_dev); |
| 236 | int ret; | 236 | int ret; |
| 237 | unsigned long mask; | ||
| 238 | 237 | ||
| 239 | if (m != IIO_CHAN_INFO_RAW) | 238 | if (m != IIO_CHAN_INFO_RAW) |
| 240 | return -EINVAL; | 239 | return -EINVAL; |
| @@ -243,12 +242,6 @@ static int mxs_lradc_read_raw(struct iio_dev *iio_dev, | |||
| 243 | if (chan->channel > LRADC_MAX_TOTAL_CHANS) | 242 | if (chan->channel > LRADC_MAX_TOTAL_CHANS) |
| 244 | return -EINVAL; | 243 | return -EINVAL; |
| 245 | 244 | ||
| 246 | /* Validate the channel if it doesn't intersect with reserved chans. */ | ||
| 247 | bitmap_set(&mask, chan->channel, 1); | ||
| 248 | ret = iio_validate_scan_mask_onehot(iio_dev, &mask); | ||
| 249 | if (ret) | ||
| 250 | return -EINVAL; | ||
| 251 | |||
| 252 | /* | 245 | /* |
| 253 | * See if there is no buffered operation in progess. If there is, simply | 246 | * See if there is no buffered operation in progess. If there is, simply |
| 254 | * bail out. This can be improved to support both buffered and raw IO at | 247 | * bail out. This can be improved to support both buffered and raw IO at |
