AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2024-12-28 11:18:45 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

staging:iio:gyro:adis16260 unwind use of IIO_CHAN macro.

Browse Source 
This macro is being removed to simplify ongoing maintenance
so we need to unwind and remaining users.

Signed-off-by: Jonathan Cameron <jic23@kernel.org>
Acked-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Jonathan Cameron 2012-04-13 10:42:57 +01:00 committed by Greg Kroah-Hartman
parent 7643f09e9f
commit bbdb955527
1 changed files with 65 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

89
drivers/staging/iio/gyro/adis16260_core.c
View File

@ -389,30 +389,71 @@ enum adis16260_channel {
}; };
#define ADIS16260_GYRO_CHANNEL_SET(axis, mod) \ #define ADIS16260_GYRO_CHANNEL_SET(axis, mod) \
struct iio_chan_spec adis16260_channels_##axis[] = { \ struct iio_chan_spec adis16260_channels_##axis[] = { \
IIO_CHAN(IIO_ANGL_VEL, 1, 0, 0, NULL, 0, mod, \ { \
IIO_CHAN_INFO_CALIBBIAS_SEPARATE_BIT | \ .type = IIO_ANGL_VEL, \
IIO_CHAN_INFO_CALIBSCALE_SEPARATE_BIT | \ .modified = 1, \
IIO_CHAN_INFO_SCALE_SEPARATE_BIT, \ .channel2 = mod, \
gyro, ADIS16260_SCAN_GYRO, \ .info_mask = IIO_CHAN_INFO_CALIBBIAS_SEPARATE_BIT | \
IIO_ST('s', 14, 16, 0), 0), \ IIO_CHAN_INFO_CALIBSCALE_SEPARATE_BIT | \
IIO_CHAN(IIO_ANGL, 1, 0, 0, NULL, 0, mod, \ IIO_CHAN_INFO_SCALE_SEPARATE_BIT, \
0, \ .address = gyro, \
angle, ADIS16260_SCAN_ANGL, \ .scan_index = ADIS16260_SCAN_GYRO, \
IIO_ST('u', 14, 16, 0), 0), \ .scan_type = { \
IIO_CHAN(IIO_TEMP, 0, 1, 0, NULL, 0, 0, \ .sign = 's', \
IIO_CHAN_INFO_OFFSET_SEPARATE_BIT | \ .realbits = 14, \
IIO_CHAN_INFO_SCALE_SEPARATE_BIT, \ .storagebits = 16, \
temp, ADIS16260_SCAN_TEMP, \ }, \
IIO_ST('u', 12, 16, 0), 0), \ }, { \
IIO_CHAN(IIO_VOLTAGE, 0, 1, 0, "supply", 0, 0, \ .type = IIO_ANGL, \
IIO_CHAN_INFO_SCALE_SEPARATE_BIT, \ .modified = 1, \
in_supply, ADIS16260_SCAN_SUPPLY, \ .channel2 = mod, \
IIO_ST('u', 12, 16, 0), 0), \ .address = angle, \
IIO_CHAN(IIO_VOLTAGE, 0, 1, 0, NULL, 1, 0, \ .scan_index = ADIS16260_SCAN_ANGL, \
IIO_CHAN_INFO_SCALE_SEPARATE_BIT, \ .scan_type = { \
in_aux, ADIS16260_SCAN_AUX_ADC, \ .sign = 'u', \
IIO_ST('u', 12, 16, 0), 0), \ .realbits = 14, \
IIO_CHAN_SOFT_TIMESTAMP(5) \ .storagebits = 16, \
}, \
}, { \
.type = IIO_TEMP, \
.indexed = 1, \
.channel = 0, \
.info_mask = IIO_CHAN_INFO_OFFSET_SEPARATE_BIT | \
IIO_CHAN_INFO_SCALE_SEPARATE_BIT, \
.address = temp, \
.scan_index = ADIS16260_SCAN_TEMP, \
.scan_type = { \
.sign = 'u', \
.realbits = 12, \
.storagebits = 16, \
}, \
}, { \
.type = IIO_VOLTAGE, \
.indexed = 1, \
.channel = 0, \
.extend_name = "supply", \
.info_mask = IIO_CHAN_INFO_SCALE_SEPARATE_BIT, \
.address = in_supply, \
.scan_index = ADIS16260_SCAN_SUPPLY, \
.scan_type = { \
.sign = 'u', \
.realbits = 12, \
.storagebits = 16, \
}, \
}, { \
.type = IIO_VOLTAGE, \
.indexed = 1, \
.channel = 1, \
.info_mask = IIO_CHAN_INFO_SCALE_SEPARATE_BIT, \
.address = in_aux, \
.scan_index = ADIS16260_SCAN_AUX_ADC, \
.scan_type = { \
.sign = 'u', \
.realbits = 12, \
.storagebits = 16, \
}, \
}, \
IIO_CHAN_SOFT_TIMESTAMP(5), \
} }
static const ADIS16260_GYRO_CHANNEL_SET(x, IIO_MOD_X); static const ADIS16260_GYRO_CHANNEL_SET(x, IIO_MOD_X);