[ 032/110] iio: mxs-lradc: Remove useless check in read_raw

From: Greg Kroah-Hartman
Date: Tue Sep 24 2013 - 21:14:45 EST

3.10-stable review patch. If anyone has any objections, please let me know.


From: Marek Vasut <marex@xxxxxxx>

commit 2a961d0995cdadbfba565b28beada59c5ae7ebae upstream.

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@xxxxxxx>
Tested-by: Otavio Salvador <otavio@xxxxxxxxxxxxxxxx>
Acked-by: Hector Palacios <hector.palacios@xxxxxxxx>
Signed-off-by: Jonathan Cameron <jic23@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>

drivers/staging/iio/adc/mxs-lradc.c | 7 -------
1 file changed, 7 deletions(-)

--- 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
struct mxs_lradc *lradc = iio_priv(iio_dev);
int ret;
- unsigned long mask;

return -EINVAL;
@@ -243,12 +242,6 @@ static int mxs_lradc_read_raw(struct iio
if (chan->channel > LRADC_MAX_TOTAL_CHANS)
return -EINVAL;

- /* Validate the channel if it doesn't intersect with reserved chans. */
- bitmap_set(&mask, chan->channel, 1);
- ret = iio_validate_scan_mask_onehot(iio_dev, &mask);
- if (ret)
- return -EINVAL;
* See if there is no buffered operation in progess. If there is, simply
* bail out. This can be improved to support both buffered and raw IO at

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