staging:iio:accel:adis move to info_mask_(shared_by_type/separate)

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

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

Signed-off-by: Jonathan Cameron <jic23@kernel.org>
Acked-by: Lars-Peter Clausen <lars@metafoo.de>

Jonathan Cameron 13 years ago b841f8ab bb7c5940

+32 -37

7 changed files

expand all

drivers

staging

iio

accel

adis16201_core.c

adis16203_core.c

adis16204_core.c

adis16209_core.c

adis16240_core.c

gyro

adis16260_core.c

include

linux

iio

imu

adis.h

+4 -4

drivers/staging/iio/accel/adis16201_core.c

··· 134 134 ADIS_SUPPLY_CHAN(ADIS16201_SUPPLY_OUT, ADIS16201_SCAN_SUPPLY, 12), 135 135 ADIS_TEMP_CHAN(ADIS16201_TEMP_OUT, ADIS16201_SCAN_TEMP, 12), 136 136 ADIS_ACCEL_CHAN(X, ADIS16201_XACCL_OUT, ADIS16201_SCAN_ACC_X, 137 - IIO_CHAN_INFO_CALIBBIAS_SEPARATE_BIT, 14), 137 + BIT(IIO_CHAN_INFO_CALIBBIAS), 14), 138 138 ADIS_ACCEL_CHAN(Y, ADIS16201_YACCL_OUT, ADIS16201_SCAN_ACC_Y, 139 - IIO_CHAN_INFO_CALIBBIAS_SEPARATE_BIT, 14), 139 + BIT(IIO_CHAN_INFO_CALIBBIAS), 14), 140 140 ADIS_AUX_ADC_CHAN(ADIS16201_AUX_ADC, ADIS16201_SCAN_AUX_ADC, 12), 141 141 ADIS_INCLI_CHAN(X, ADIS16201_XINCL_OUT, ADIS16201_SCAN_INCLI_X, 142 - IIO_CHAN_INFO_CALIBBIAS_SEPARATE_BIT, 14), 142 + BIT(IIO_CHAN_INFO_CALIBBIAS), 14), 143 143 ADIS_INCLI_CHAN(X, ADIS16201_YINCL_OUT, ADIS16201_SCAN_INCLI_Y, 144 - IIO_CHAN_INFO_CALIBBIAS_SEPARATE_BIT, 14), 144 + BIT(IIO_CHAN_INFO_CALIBBIAS), 14), 145 145 IIO_CHAN_SOFT_TIMESTAMP(7) 146 146 }; 147 147

+1 -1

drivers/staging/iio/accel/adis16203_core.c

··· 102 102 ADIS_SUPPLY_CHAN(ADIS16203_SUPPLY_OUT, ADIS16203_SCAN_SUPPLY, 12), 103 103 ADIS_AUX_ADC_CHAN(ADIS16203_AUX_ADC, ADIS16203_SCAN_AUX_ADC, 12), 104 104 ADIS_INCLI_CHAN(X, ADIS16203_XINCL_OUT, ADIS16203_SCAN_INCLI_X, 105 - IIO_CHAN_INFO_CALIBBIAS_SEPARATE_BIT, 14), 105 + BIT(IIO_CHAN_INFO_CALIBBIAS), 14), 106 106 /* Fixme: Not what it appears to be - see data sheet */ 107 107 ADIS_INCLI_CHAN(Y, ADIS16203_YINCL_OUT, ADIS16203_SCAN_INCLI_Y, 0, 14), 108 108 ADIS_TEMP_CHAN(ADIS16203_TEMP_OUT, ADIS16203_SCAN_TEMP, 12),

+3 -5

drivers/staging/iio/accel/adis16204_core.c

··· 140 140 ADIS_AUX_ADC_CHAN(ADIS16204_AUX_ADC, ADIS16204_SCAN_AUX_ADC, 12), 141 141 ADIS_TEMP_CHAN(ADIS16204_TEMP_OUT, ADIS16204_SCAN_TEMP, 12), 142 142 ADIS_ACCEL_CHAN(X, ADIS16204_XACCL_OUT, ADIS16204_SCAN_ACC_X, 143 - IIO_CHAN_INFO_CALIBBIAS_SEPARATE_BIT | 144 - IIO_CHAN_INFO_PEAK_SEPARATE_BIT, 14), 143 + BIT(IIO_CHAN_INFO_CALIBBIAS) | BIT(IIO_CHAN_INFO_PEAK), 14), 145 144 ADIS_ACCEL_CHAN(Y, ADIS16204_YACCL_OUT, ADIS16204_SCAN_ACC_Y, 146 - IIO_CHAN_INFO_CALIBBIAS_SEPARATE_BIT | 147 - IIO_CHAN_INFO_PEAK_SEPARATE_BIT, 14), 145 + BIT(IIO_CHAN_INFO_CALIBBIAS) | BIT(IIO_CHAN_INFO_PEAK), 14), 148 146 ADIS_ACCEL_CHAN(ROOT_SUM_SQUARED_X_Y, ADIS16204_XY_RSS_OUT, 149 - ADIS16204_SCAN_ACC_XY, IIO_CHAN_INFO_PEAK_SEPARATE_BIT, 14), 147 + ADIS16204_SCAN_ACC_XY, BIT(IIO_CHAN_INFO_PEAK), 14), 150 148 IIO_CHAN_SOFT_TIMESTAMP(5), 151 149 }; 152 150

+2 -2

drivers/staging/iio/accel/adis16209_core.c

··· 133 133 ADIS_SUPPLY_CHAN(ADIS16209_SUPPLY_OUT, ADIS16209_SCAN_SUPPLY, 14), 134 134 ADIS_TEMP_CHAN(ADIS16209_TEMP_OUT, ADIS16209_SCAN_TEMP, 12), 135 135 ADIS_ACCEL_CHAN(X, ADIS16209_XACCL_OUT, ADIS16209_SCAN_ACC_X, 136 - IIO_CHAN_INFO_CALIBBIAS_SEPARATE_BIT, 14), 136 + BIT(IIO_CHAN_INFO_CALIBBIAS), 14), 137 137 ADIS_ACCEL_CHAN(Y, ADIS16209_YACCL_OUT, ADIS16209_SCAN_ACC_Y, 138 - IIO_CHAN_INFO_CALIBBIAS_SEPARATE_BIT, 14), 138 + BIT(IIO_CHAN_INFO_CALIBBIAS), 14), 139 139 ADIS_AUX_ADC_CHAN(ADIS16209_AUX_ADC, ADIS16209_SCAN_AUX_ADC, 12), 140 140 ADIS_INCLI_CHAN(X, ADIS16209_XINCL_OUT, ADIS16209_SCAN_INCLI_X, 0, 14), 141 141 ADIS_INCLI_CHAN(Y, ADIS16209_YINCL_OUT, ADIS16209_SCAN_INCLI_Y, 0, 14),

+3 -6

drivers/staging/iio/accel/adis16240_core.c

··· 176 176 ADIS_SUPPLY_CHAN(ADIS16240_SUPPLY_OUT, ADIS16240_SCAN_SUPPLY, 10), 177 177 ADIS_AUX_ADC_CHAN(ADIS16240_AUX_ADC, ADIS16240_SCAN_AUX_ADC, 10), 178 178 ADIS_ACCEL_CHAN(X, ADIS16240_XACCL_OUT, ADIS16240_SCAN_ACC_X, 179 - IIO_CHAN_INFO_CALIBBIAS_SEPARATE_BIT | 180 - IIO_CHAN_INFO_PEAK_SEPARATE_BIT, 10), 179 + BIT(IIO_CHAN_INFO_CALIBBIAS) | BIT(IIO_CHAN_INFO_PEAK), 10), 181 180 ADIS_ACCEL_CHAN(Y, ADIS16240_YACCL_OUT, ADIS16240_SCAN_ACC_Y, 182 - IIO_CHAN_INFO_CALIBBIAS_SEPARATE_BIT | 183 - IIO_CHAN_INFO_PEAK_SEPARATE_BIT, 10), 181 + BIT(IIO_CHAN_INFO_CALIBBIAS) | BIT(IIO_CHAN_INFO_PEAK), 10), 184 182 ADIS_ACCEL_CHAN(Z, ADIS16240_ZACCL_OUT, ADIS16240_SCAN_ACC_Z, 185 - IIO_CHAN_INFO_CALIBBIAS_SEPARATE_BIT | 186 - IIO_CHAN_INFO_PEAK_SEPARATE_BIT, 10), 183 + BIT(IIO_CHAN_INFO_CALIBBIAS) | BIT(IIO_CHAN_INFO_PEAK), 10), 187 184 ADIS_TEMP_CHAN(ADIS16240_TEMP_OUT, ADIS16240_SCAN_TEMP, 10), 188 185 IIO_CHAN_SOFT_TIMESTAMP(6) 189 186 };

+2 -2

drivers/staging/iio/gyro/adis16260_core.c

··· 124 124 #define ADIS16260_GYRO_CHANNEL_SET(axis, mod) \ 125 125 struct iio_chan_spec adis16260_channels_##axis[] = { \ 126 126 ADIS_GYRO_CHAN(mod, ADIS16260_GYRO_OUT, ADIS16260_SCAN_GYRO, \ 127 - IIO_CHAN_INFO_CALIBBIAS_SEPARATE_BIT | \ 128 - IIO_CHAN_INFO_CALIBSCALE_SEPARATE_BIT, 14), \ 127 + BIT(IIO_CHAN_INFO_CALIBBIAS) | \ 128 + BIT(IIO_CHAN_INFO_CALIBSCALE), 14), \ 129 129 ADIS_INCLI_CHAN(mod, ADIS16260_ANGL_OUT, ADIS16260_SCAN_ANGL, 0, 14), \ 130 130 ADIS_TEMP_CHAN(ADIS16260_TEMP_OUT, ADIS16260_SCAN_TEMP, 12), \ 131 131 ADIS_SUPPLY_CHAN(ADIS16260_SUPPLY_OUT, ADIS16260_SCAN_SUPPLY, 12), \

+17 -17

include/linux/iio/imu/adis.h

··· 162 162 .indexed = 1, \ 163 163 .channel = (chan), \ 164 164 .extend_name = name, \ 165 - .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT | \ 166 - IIO_CHAN_INFO_SCALE_SEPARATE_BIT, \ 165 + .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) | \ 166 + BIT(IIO_CHAN_INFO_SCALE), \ 167 167 .address = (addr), \ 168 168 .scan_index = (si), \ 169 169 .scan_type = { \ ··· 184 184 .type = IIO_TEMP, \ 185 185 .indexed = 1, \ 186 186 .channel = 0, \ 187 - .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT | \ 188 - IIO_CHAN_INFO_SCALE_SEPARATE_BIT | \ 189 - IIO_CHAN_INFO_OFFSET_SEPARATE_BIT, \ 187 + .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) | \ 188 + BIT(IIO_CHAN_INFO_SCALE) | \ 189 + BIT(IIO_CHAN_INFO_OFFSET), \ 190 190 .address = (addr), \ 191 191 .scan_index = (si), \ 192 192 .scan_type = { \ ··· 197 197 }, \ 198 198 } 199 199 200 - #define ADIS_MOD_CHAN(_type, mod, addr, si, info, bits) { \ 200 + #define ADIS_MOD_CHAN(_type, mod, addr, si, info_sep, bits) { \ 201 201 .type = (_type), \ 202 202 .modified = 1, \ 203 203 .channel2 = IIO_MOD_ ## mod, \ 204 - .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT | \ 205 - IIO_CHAN_INFO_SCALE_SHARED_BIT | \ 206 - info, \ 204 + .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) | \ 205 + info_sep, \ 206 + .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE), \ 207 207 .address = (addr), \ 208 208 .scan_index = (si), \ 209 209 .scan_type = { \ ··· 214 214 }, \ 215 215 } 216 216 217 - #define ADIS_ACCEL_CHAN(mod, addr, si, info, bits) \ 218 - ADIS_MOD_CHAN(IIO_ACCEL, mod, addr, si, info, bits) 217 + #define ADIS_ACCEL_CHAN(mod, addr, si, info_sep, bits) \ 218 + ADIS_MOD_CHAN(IIO_ACCEL, mod, addr, si, info_sep, bits) 219 219 220 - #define ADIS_GYRO_CHAN(mod, addr, si, info, bits) \ 221 - ADIS_MOD_CHAN(IIO_ANGL_VEL, mod, addr, si, info, bits) 220 + #define ADIS_GYRO_CHAN(mod, addr, si, info_sep, bits) \ 221 + ADIS_MOD_CHAN(IIO_ANGL_VEL, mod, addr, si, info_sep, bits) 222 222 223 - #define ADIS_INCLI_CHAN(mod, addr, si, info, bits) \ 224 - ADIS_MOD_CHAN(IIO_INCLI, mod, addr, si, info, bits) 223 + #define ADIS_INCLI_CHAN(mod, addr, si, info_sep, bits) \ 224 + ADIS_MOD_CHAN(IIO_INCLI, mod, addr, si, info_sep, bits) 225 225 226 - #define ADIS_ROT_CHAN(mod, addr, si, info, bits) \ 227 - ADIS_MOD_CHAN(IIO_ROT, mod, addr, si, info, bits) 226 + #define ADIS_ROT_CHAN(mod, addr, si, info_sep, bits) \ 227 + ADIS_MOD_CHAN(IIO_ROT, mod, addr, si, info_sep, bits) 228 228 229 229 #ifdef CONFIG_IIO_ADIS_LIB_BUFFER 230 230