Commit b576590d authored by Michael Hennerich's avatar Michael Hennerich Committed by Greg Kroah-Hartman
Browse files

staging:iio:adc:ad7291: introduce IIO_EVENT_CODE_EXTRACT_CHAN_TYPE and use accordingly 



Fix channel type handling

Signed-off-by: default avatarMichael Hennerich <michael.hennerich@analog.com>
Signed-off-by: default avatarJonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 94c93dbd

drivers/staging/iio/adc/ad7291.c

+3 −3
Original line number Diff line number Diff line
@@ -314,7 +314,7 @@ static int ad7291_read_event_value(struct iio_dev *indio_dev, 
	u16 uval;

	s16 signval;



	switch (IIO_EVENT_CODE_EXTRACT_TYPE(event_code)) {

	switch (IIO_EVENT_CODE_EXTRACT_CHAN_TYPE(event_code)) {

	case IIO_VOLTAGE:

		reg = ad7291_limit_regs[IIO_EVENT_CODE_EXTRACT_NUM(event_code)]

			[!(IIO_EVENT_CODE_EXTRACT_DIR(event_code) ==
@@ -350,7 +350,7 @@ static int ad7291_write_event_value(struct iio_dev *indio_dev, 
	u8 reg;

	s16 signval;



	switch (IIO_EVENT_CODE_EXTRACT_TYPE(event_code)) {

	switch (IIO_EVENT_CODE_EXTRACT_CHAN_TYPE(event_code)) {

	case IIO_VOLTAGE:

		if (val > 0xFFF || val < 0)

			return -EINVAL;
@@ -378,7 +378,7 @@ static int ad7291_read_event_config(struct iio_dev *indio_dev, 
	/* To be enabled the channel must simply be on. If any are enabled

	   we are in continuous sampling mode */



	switch (IIO_EVENT_CODE_EXTRACT_TYPE(event_code)) {

	switch (IIO_EVENT_CODE_EXTRACT_CHAN_TYPE(event_code)) {

	case IIO_VOLTAGE:

		if (chip->c_mask &

		    (1 << IIO_EVENT_CODE_EXTRACT_NUM(event_code)))

drivers/staging/iio/sysfs.h

+3 −0
Original line number Diff line number Diff line
@@ -146,8 +146,11 @@ enum iio_event_direction { 
	IIO_EVENT_CODE(channelclass, 0, 0, direction, type, number, 0, 0)



#define IIO_EVENT_CODE_EXTRACT_TYPE(mask) ((mask >> 56) & 0xFF)



#define IIO_EVENT_CODE_EXTRACT_DIR(mask) ((mask >> 48) & 0xCF)



#define IIO_EVENT_CODE_EXTRACT_CHAN_TYPE(mask) ((mask >> 32) & 0xFF)



/* Event code number extraction depends on which type of event we have.

 * Perhaps review this function in the future*/

#define IIO_EVENT_CODE_EXTRACT_NUM(mask) (mask & 0xFFFF)

CRA Git | Maintained and supported by SUSTech CRA and CCSE