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

staging:iio:light:tsl2x7x move to info_mask_(shared_by_type/separate) 

The original info_mask is going away in favour of the broken out versions.

Signed-off-by: Jonathan Cameron <jic23@kernel.org>
cc: Jon Brenner <jon.brenner@ams.com>
This commit is contained in:
Jonathan Cameron 2013-02-27 19:40:11 +00:00
Родитель 93a9fdff21
Коммит cca9b7ff2a
1 изменённых файлов: 20 добавлений и 20 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

40
drivers/staging/iio/light/tsl2x7x_core.c
Просмотреть файл

@ -1733,14 +1733,14 @@ static const struct tsl2x7x_chip_info tsl2x7x_chip_info_tbl[] = {
.type = IIO_LIGHT, .type = IIO_LIGHT,
.indexed = 1, .indexed = 1,
.channel = 0, .channel = 0,
.info_mask = IIO_CHAN_INFO_PROCESSED_SEPARATE_BIT, .info_mask_separate = BIT(IIO_CHAN_INFO_PROCESSED),
}, { }, {
.type = IIO_INTENSITY, .type = IIO_INTENSITY,
.indexed = 1, .indexed = 1,
.channel = 0, .channel = 0,
.info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT | .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) |
IIO_CHAN_INFO_CALIBSCALE_SEPARATE_BIT | BIT(IIO_CHAN_INFO_CALIBSCALE) |
IIO_CHAN_INFO_CALIBBIAS_SEPARATE_BIT, BIT(IIO_CHAN_INFO_CALIBBIAS),
.event_mask = TSL2X7X_EVENT_MASK .event_mask = TSL2X7X_EVENT_MASK
}, { }, {
.type = IIO_INTENSITY, .type = IIO_INTENSITY,
@ -1757,7 +1757,7 @@ static const struct tsl2x7x_chip_info tsl2x7x_chip_info_tbl[] = {
.type = IIO_PROXIMITY, .type = IIO_PROXIMITY,
.indexed = 1, .indexed = 1,
.channel = 0, .channel = 0,
.info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT, .info_mask_separate = BIT(IIO_CHAN_INFO_RAW),
.event_mask = TSL2X7X_EVENT_MASK .event_mask = TSL2X7X_EVENT_MASK
}, },
}, },
@ -1770,25 +1770,25 @@ static const struct tsl2x7x_chip_info tsl2x7x_chip_info_tbl[] = {
.type = IIO_LIGHT, .type = IIO_LIGHT,
.indexed = 1, .indexed = 1,
.channel = 0, .channel = 0,
.info_mask = IIO_CHAN_INFO_PROCESSED_SEPARATE_BIT .info_mask_separate = BIT(IIO_CHAN_INFO_PROCESSED)
}, { }, {
.type = IIO_INTENSITY, .type = IIO_INTENSITY,
.indexed = 1, .indexed = 1,
.channel = 0, .channel = 0,
.info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT | .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) |
IIO_CHAN_INFO_CALIBSCALE_SEPARATE_BIT | BIT(IIO_CHAN_INFO_CALIBSCALE) |
IIO_CHAN_INFO_CALIBBIAS_SEPARATE_BIT, BIT(IIO_CHAN_INFO_CALIBBIAS),
.event_mask = TSL2X7X_EVENT_MASK .event_mask = TSL2X7X_EVENT_MASK
}, { }, {
.type = IIO_INTENSITY, .type = IIO_INTENSITY,
.indexed = 1, .indexed = 1,
.channel = 1, .channel = 1,
.info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT, .info_mask_separate = BIT(IIO_CHAN_INFO_RAW),
}, { }, {
.type = IIO_PROXIMITY, .type = IIO_PROXIMITY,
.indexed = 1, .indexed = 1,
.channel = 0, .channel = 0,
.info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT, .info_mask_separate = BIT(IIO_CHAN_INFO_RAW),
.event_mask = TSL2X7X_EVENT_MASK .event_mask = TSL2X7X_EVENT_MASK
}, },
}, },
@ -1801,8 +1801,8 @@ static const struct tsl2x7x_chip_info tsl2x7x_chip_info_tbl[] = {
.type = IIO_PROXIMITY, .type = IIO_PROXIMITY,
.indexed = 1, .indexed = 1,
.channel = 0, .channel = 0,
.info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT | .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) |
IIO_CHAN_INFO_CALIBSCALE_SEPARATE_BIT, BIT(IIO_CHAN_INFO_CALIBSCALE),
.event_mask = TSL2X7X_EVENT_MASK .event_mask = TSL2X7X_EVENT_MASK
}, },
}, },
@ -1815,26 +1815,26 @@ static const struct tsl2x7x_chip_info tsl2x7x_chip_info_tbl[] = {
.type = IIO_LIGHT, .type = IIO_LIGHT,
.indexed = 1, .indexed = 1,
.channel = 0, .channel = 0,
.info_mask = IIO_CHAN_INFO_PROCESSED_SEPARATE_BIT, .info_mask_separate = BIT(IIO_CHAN_INFO_PROCESSED),
}, { }, {
.type = IIO_INTENSITY, .type = IIO_INTENSITY,
.indexed = 1, .indexed = 1,
.channel = 0, .channel = 0,
.info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT | .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) |
IIO_CHAN_INFO_CALIBSCALE_SEPARATE_BIT | BIT(IIO_CHAN_INFO_CALIBSCALE) |
IIO_CHAN_INFO_CALIBBIAS_SEPARATE_BIT, BIT(IIO_CHAN_INFO_CALIBBIAS),
.event_mask = TSL2X7X_EVENT_MASK .event_mask = TSL2X7X_EVENT_MASK
}, { }, {
.type = IIO_INTENSITY, .type = IIO_INTENSITY,
.indexed = 1, .indexed = 1,
.channel = 1, .channel = 1,
.info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT, .info_mask_separate = BIT(IIO_CHAN_INFO_RAW),
}, { }, {
.type = IIO_PROXIMITY, .type = IIO_PROXIMITY,
.indexed = 1, .indexed = 1,
.channel = 0, .channel = 0,
.info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT | .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) |
IIO_CHAN_INFO_CALIBSCALE_SEPARATE_BIT, BIT(IIO_CHAN_INFO_CALIBSCALE),
.event_mask = TSL2X7X_EVENT_MASK .event_mask = TSL2X7X_EVENT_MASK
}, },
}, },