Commit 924f8a21 authored by Lars-Peter Clausen's avatar Lars-Peter Clausen Committed by Greg Kroah-Hartman
Browse files

staging:iio: Do not use bitmasks for channel info addresses 



Currently the iio framework uses bitmasks for the address field of channel info
attributes. This is for historical reasons and no longer required since it will
only ever query a single info attribute at once. This patch changes the code to
use the non-shifted iio_chan_info_enum values for the info attribute address.

Signed-off-by: default avatarLars-Peter Clausen <lars@metafoo.de>
Signed-off-by: default avatarJonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 3014cd97

drivers/staging/iio/accel/adis16201_core.c

+5 −5
Original line number Diff line number Diff line
@@ -322,8 +322,8 @@ static int adis16201_read_raw(struct iio_dev *indio_dev, 
		*val = val16;

		mutex_unlock(&indio_dev->mlock);

		return IIO_VAL_INT;

	case (1 << IIO_CHAN_INFO_SCALE_SEPARATE):

	case (1 << IIO_CHAN_INFO_SCALE_SHARED):

	case IIO_CHAN_INFO_SCALE_SEPARATE:

	case IIO_CHAN_INFO_SCALE_SHARED:

		switch (chan->type) {

		case IIO_VOLTAGE:

			*val = 0;
@@ -348,10 +348,10 @@ static int adis16201_read_raw(struct iio_dev *indio_dev, 
			return -EINVAL;

		}

		break;

	case (1 << IIO_CHAN_INFO_OFFSET_SEPARATE):

	case IIO_CHAN_INFO_OFFSET_SEPARATE:

		*val = 25;

		return IIO_VAL_INT;

	case (1 << IIO_CHAN_INFO_CALIBBIAS_SEPARATE):

	case IIO_CHAN_INFO_CALIBBIAS_SEPARATE:

		switch (chan->type) {

		case IIO_ACCEL:

			bits = 12;
@@ -388,7 +388,7 @@ static int adis16201_write_raw(struct iio_dev *indio_dev, 
	s16 val16;

	u8 addr;

	switch (mask) {

	case (1 << IIO_CHAN_INFO_CALIBBIAS_SEPARATE):

	case IIO_CHAN_INFO_CALIBBIAS_SEPARATE:

		switch (chan->type) {

		case IIO_ACCEL:

			bits = 12;

drivers/staging/iio/accel/adis16203_core.c

+4 −4
Original line number Diff line number Diff line
@@ -329,8 +329,8 @@ static int adis16203_read_raw(struct iio_dev *indio_dev, 
		*val = val16;

		mutex_unlock(&indio_dev->mlock);

		return IIO_VAL_INT;

	case (1 << IIO_CHAN_INFO_SCALE_SEPARATE):

	case (1 << IIO_CHAN_INFO_SCALE_SHARED):

	case IIO_CHAN_INFO_SCALE_SEPARATE:

	case IIO_CHAN_INFO_SCALE_SHARED:

		switch (chan->type) {

		case IIO_VOLTAGE:

			*val = 0;
@@ -350,10 +350,10 @@ static int adis16203_read_raw(struct iio_dev *indio_dev, 
		default:

			return -EINVAL;

		}

	case (1 << IIO_CHAN_INFO_OFFSET_SEPARATE):

	case IIO_CHAN_INFO_OFFSET_SEPARATE:

		*val = 25;

		return IIO_VAL_INT;

	case (1 << IIO_CHAN_INFO_CALIBBIAS_SEPARATE):

	case IIO_CHAN_INFO_CALIBBIAS_SEPARATE:

		bits = 14;

		mutex_lock(&indio_dev->mlock);

		addr = adis16203_addresses[chan->address][1];

drivers/staging/iio/accel/adis16204_core.c

+6 −6
Original line number Diff line number Diff line
@@ -366,7 +366,7 @@ static int adis16204_read_raw(struct iio_dev *indio_dev, 
		*val = val16;

		mutex_unlock(&indio_dev->mlock);

		return IIO_VAL_INT;

	case (1 << IIO_CHAN_INFO_SCALE_SEPARATE):

	case IIO_CHAN_INFO_SCALE_SEPARATE:

		switch (chan->type) {

		case IIO_VOLTAGE:

			*val = 0;
@@ -390,12 +390,12 @@ static int adis16204_read_raw(struct iio_dev *indio_dev, 
			return -EINVAL;

		}

		break;

	case (1 << IIO_CHAN_INFO_OFFSET_SEPARATE):

	case IIO_CHAN_INFO_OFFSET_SEPARATE:

		*val = 25;

		return IIO_VAL_INT;

	case (1 << IIO_CHAN_INFO_CALIBBIAS_SEPARATE):

	case (1 << IIO_CHAN_INFO_PEAK_SEPARATE):

		if (mask == (1 << IIO_CHAN_INFO_CALIBBIAS_SEPARATE)) {

	case IIO_CHAN_INFO_CALIBBIAS_SEPARATE:

	case IIO_CHAN_INFO_PEAK_SEPARATE:

		if (mask == IIO_CHAN_INFO_CALIBBIAS_SEPARATE) {

			bits = 12;

			addrind = 1;

		} else { /* PEAK_SEPARATE */
@@ -428,7 +428,7 @@ static int adis16204_write_raw(struct iio_dev *indio_dev, 
	s16 val16;

	u8 addr;

	switch (mask) {

	case (1 << IIO_CHAN_INFO_CALIBBIAS_SEPARATE):

	case IIO_CHAN_INFO_CALIBBIAS_SEPARATE:

		switch (chan->type) {

		case IIO_ACCEL:

			bits = 12;

drivers/staging/iio/accel/adis16209_core.c

+5 −5
Original line number Diff line number Diff line
@@ -304,7 +304,7 @@ static int adis16209_write_raw(struct iio_dev *indio_dev, 
	s16 val16;

	u8 addr;

	switch (mask) {

	case (1 << IIO_CHAN_INFO_CALIBBIAS_SEPARATE):

	case IIO_CHAN_INFO_CALIBBIAS_SEPARATE:

		switch (chan->type) {

		case IIO_ACCEL:

		case IIO_INCLI:
@@ -355,8 +355,8 @@ static int adis16209_read_raw(struct iio_dev *indio_dev, 
		*val = val16;

		mutex_unlock(&indio_dev->mlock);

		return IIO_VAL_INT;

	case (1 << IIO_CHAN_INFO_SCALE_SEPARATE):

	case (1 << IIO_CHAN_INFO_SCALE_SHARED):

	case IIO_CHAN_INFO_SCALE_SEPARATE:

	case IIO_CHAN_INFO_SCALE_SHARED:

		switch (chan->type) {

		case IIO_VOLTAGE:

			*val = 0;
@@ -381,10 +381,10 @@ static int adis16209_read_raw(struct iio_dev *indio_dev, 
			return -EINVAL;

		}

		break;

	case (1 << IIO_CHAN_INFO_OFFSET_SEPARATE):

	case IIO_CHAN_INFO_OFFSET_SEPARATE:

		*val = 25;

		return IIO_VAL_INT;

	case (1 << IIO_CHAN_INFO_CALIBBIAS_SEPARATE):

	case IIO_CHAN_INFO_CALIBBIAS_SEPARATE:

		switch (chan->type) {

		case IIO_ACCEL:

			bits = 14;

drivers/staging/iio/accel/adis16220_core.c

+3 −3
Original line number Diff line number Diff line
@@ -510,17 +510,17 @@ static int adis16220_read_raw(struct iio_dev *indio_dev, 
	case 0:

		addrind = 0;

		break;

	case (1 << IIO_CHAN_INFO_OFFSET_SEPARATE):

	case IIO_CHAN_INFO_OFFSET_SEPARATE:

		if (chan->type == IIO_TEMP) {

			*val = 25;

			return IIO_VAL_INT;

		}

		addrind = 1;

		break;

	case (1 << IIO_CHAN_INFO_PEAK_SEPARATE):

	case IIO_CHAN_INFO_PEAK_SEPARATE:

		addrind = 2;

		break;

	case (1 << IIO_CHAN_INFO_SCALE_SEPARATE):

	case IIO_CHAN_INFO_SCALE_SEPARATE:

		*val = 0;

		switch (chan->type) {

		case IIO_TEMP: