microsoft
/
WSL2-Linux-Kernel
зеркало из https://github.com/microsoft/WSL2-Linux-Kernel.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

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

Fix channel type handling

Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Michael Hennerich 2011-09-02 17:25:42 +01:00 коммит произвёл Greg Kroah-Hartman
Родитель 94c93dbde9
Коммит b576590dcd
2 изменённых файлов: 6 добавлений и 3 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

6
drivers/staging/iio/adc/ad7291.c
Просмотреть файл

@ -314,7 +314,7 @@ static int ad7291_read_event_value(struct iio_dev *indio_dev,
u16 uval; u16 uval;
s16 signval; s16 signval;
switch (IIO_EVENT_CODE_EXTRACT_TYPE(event_code)) { switch (IIO_EVENT_CODE_EXTRACT_CHAN_TYPE(event_code)) {
case IIO_VOLTAGE: case IIO_VOLTAGE:
reg = ad7291_limit_regs[IIO_EVENT_CODE_EXTRACT_NUM(event_code)] reg = ad7291_limit_regs[IIO_EVENT_CODE_EXTRACT_NUM(event_code)]
[!(IIO_EVENT_CODE_EXTRACT_DIR(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; u8 reg;
s16 signval; s16 signval;
switch (IIO_EVENT_CODE_EXTRACT_TYPE(event_code)) { switch (IIO_EVENT_CODE_EXTRACT_CHAN_TYPE(event_code)) {
case IIO_VOLTAGE: case IIO_VOLTAGE:
if (val > 0xFFF || val < 0) if (val > 0xFFF || val < 0)
return -EINVAL; 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 /* To be enabled the channel must simply be on. If any are enabled
we are in continuous sampling mode */ 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: case IIO_VOLTAGE:
if (chip->c_mask & if (chip->c_mask &
(1 << IIO_EVENT_CODE_EXTRACT_NUM(event_code))) (1 << IIO_EVENT_CODE_EXTRACT_NUM(event_code)))

3
drivers/staging/iio/sysfs.h
Просмотреть файл

@ -146,8 +146,11 @@ enum iio_event_direction {
IIO_EVENT_CODE(channelclass, 0, 0, direction, type, number, 0, 0) 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_TYPE(mask) ((mask >> 56) & 0xFF)
#define IIO_EVENT_CODE_EXTRACT_DIR(mask) ((mask >> 48) & 0xCF) #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. /* Event code number extraction depends on which type of event we have.
* Perhaps review this function in the future*/ * Perhaps review this function in the future*/
#define IIO_EVENT_CODE_EXTRACT_NUM(mask) (mask & 0xFFFF) #define IIO_EVENT_CODE_EXTRACT_NUM(mask) (mask & 0xFFFF)