tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
iio:hid_sensors 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>
+40
-40
+12
-12
drivers/iio/accel/hid-sensor-accel-3d.c
+12
-12
drivers/iio/accel/hid-sensor-accel-3d.c
···
60
60
.type = IIO_ACCEL,
61
61
.modified = 1,
62
62
.channel2 = IIO_MOD_X,
63
-
.info_mask = IIO_CHAN_INFO_OFFSET_SHARED_BIT |
64
-
IIO_CHAN_INFO_SCALE_SHARED_BIT |
65
-
IIO_CHAN_INFO_SAMP_FREQ_SHARED_BIT |
66
-
IIO_CHAN_INFO_HYSTERESIS_SHARED_BIT,
63
+
.info_mask_shared_by_type = BIT(IIO_CHAN_INFO_OFFSET) |
64
+
BIT(IIO_CHAN_INFO_SCALE) |
65
+
BIT(IIO_CHAN_INFO_SAMP_FREQ) |
66
+
BIT(IIO_CHAN_INFO_HYSTERESIS),
67
67
.scan_index = CHANNEL_SCAN_INDEX_X,
68
68
}, {
69
69
.type = IIO_ACCEL,
70
70
.modified = 1,
71
71
.channel2 = IIO_MOD_Y,
72
-
.info_mask = IIO_CHAN_INFO_OFFSET_SHARED_BIT |
73
-
IIO_CHAN_INFO_SCALE_SHARED_BIT |
74
-
IIO_CHAN_INFO_SAMP_FREQ_SHARED_BIT |
75
-
IIO_CHAN_INFO_HYSTERESIS_SHARED_BIT,
72
+
.info_mask_shared_by_type = BIT(IIO_CHAN_INFO_OFFSET) |
73
+
BIT(IIO_CHAN_INFO_SCALE) |
74
+
BIT(IIO_CHAN_INFO_SAMP_FREQ) |
75
+
BIT(IIO_CHAN_INFO_HYSTERESIS),
76
76
.scan_index = CHANNEL_SCAN_INDEX_Y,
77
77
}, {
78
78
.type = IIO_ACCEL,
79
79
.modified = 1,
80
80
.channel2 = IIO_MOD_Z,
81
-
.info_mask = IIO_CHAN_INFO_OFFSET_SHARED_BIT |
82
-
IIO_CHAN_INFO_SCALE_SHARED_BIT |
83
-
IIO_CHAN_INFO_SAMP_FREQ_SHARED_BIT |
84
-
IIO_CHAN_INFO_HYSTERESIS_SHARED_BIT,
81
+
.info_mask_shared_by_type = BIT(IIO_CHAN_INFO_OFFSET) |
82
+
BIT(IIO_CHAN_INFO_SCALE) |
83
+
BIT(IIO_CHAN_INFO_SAMP_FREQ) |
84
+
BIT(IIO_CHAN_INFO_HYSTERESIS),
85
85
.scan_index = CHANNEL_SCAN_INDEX_Z,
86
86
}
87
87
};
+12
-12
drivers/iio/gyro/hid-sensor-gyro-3d.c
+12
-12
drivers/iio/gyro/hid-sensor-gyro-3d.c
···
60
60
.type = IIO_ANGL_VEL,
61
61
.modified = 1,
62
62
.channel2 = IIO_MOD_X,
63
-
.info_mask = IIO_CHAN_INFO_OFFSET_SHARED_BIT |
64
-
IIO_CHAN_INFO_SCALE_SHARED_BIT |
65
-
IIO_CHAN_INFO_SAMP_FREQ_SHARED_BIT |
66
-
IIO_CHAN_INFO_HYSTERESIS_SHARED_BIT,
63
+
.info_mask_shared_by_type = BIT(IIO_CHAN_INFO_OFFSET) |
64
+
BIT(IIO_CHAN_INFO_SCALE) |
65
+
BIT(IIO_CHAN_INFO_SAMP_FREQ) |
66
+
BIT(IIO_CHAN_INFO_HYSTERESIS),
67
67
.scan_index = CHANNEL_SCAN_INDEX_X,
68
68
}, {
69
69
.type = IIO_ANGL_VEL,
70
70
.modified = 1,
71
71
.channel2 = IIO_MOD_Y,
72
-
.info_mask = IIO_CHAN_INFO_OFFSET_SHARED_BIT |
73
-
IIO_CHAN_INFO_SCALE_SHARED_BIT |
74
-
IIO_CHAN_INFO_SAMP_FREQ_SHARED_BIT |
75
-
IIO_CHAN_INFO_HYSTERESIS_SHARED_BIT,
72
+
.info_mask_shared_by_type = BIT(IIO_CHAN_INFO_OFFSET) |
73
+
BIT(IIO_CHAN_INFO_SCALE) |
74
+
BIT(IIO_CHAN_INFO_SAMP_FREQ) |
75
+
BIT(IIO_CHAN_INFO_HYSTERESIS),
76
76
.scan_index = CHANNEL_SCAN_INDEX_Y,
77
77
}, {
78
78
.type = IIO_ANGL_VEL,
79
79
.modified = 1,
80
80
.channel2 = IIO_MOD_Z,
81
-
.info_mask = IIO_CHAN_INFO_OFFSET_SHARED_BIT |
82
-
IIO_CHAN_INFO_SCALE_SHARED_BIT |
83
-
IIO_CHAN_INFO_SAMP_FREQ_SHARED_BIT |
84
-
IIO_CHAN_INFO_HYSTERESIS_SHARED_BIT,
81
+
.info_mask_shared_by_type = BIT(IIO_CHAN_INFO_OFFSET) |
82
+
BIT(IIO_CHAN_INFO_SCALE) |
83
+
BIT(IIO_CHAN_INFO_SAMP_FREQ) |
84
+
BIT(IIO_CHAN_INFO_HYSTERESIS),
85
85
.scan_index = CHANNEL_SCAN_INDEX_Z,
86
86
}
87
87
};
+4
-4
drivers/iio/light/hid-sensor-als.c
+4
-4
drivers/iio/light/hid-sensor-als.c
···
49
49
.type = IIO_INTENSITY,
50
50
.modified = 1,
51
51
.channel2 = IIO_MOD_LIGHT_BOTH,
52
-
.info_mask = IIO_CHAN_INFO_OFFSET_SHARED_BIT |
53
-
IIO_CHAN_INFO_SCALE_SHARED_BIT |
54
-
IIO_CHAN_INFO_SAMP_FREQ_SHARED_BIT |
55
-
IIO_CHAN_INFO_HYSTERESIS_SHARED_BIT,
52
+
.info_mask_shared_by_type = BIT(IIO_CHAN_INFO_OFFSET) |
53
+
BIT(IIO_CHAN_INFO_SCALE) |
54
+
BIT(IIO_CHAN_INFO_SAMP_FREQ) |
55
+
BIT(IIO_CHAN_INFO_HYSTERESIS),
56
56
.scan_index = CHANNEL_SCAN_INDEX_ILLUM,
57
57
}
58
58
};
+12
-12
drivers/iio/magnetometer/hid-sensor-magn-3d.c
+12
-12
drivers/iio/magnetometer/hid-sensor-magn-3d.c
···
60
60
.type = IIO_MAGN,
61
61
.modified = 1,
62
62
.channel2 = IIO_MOD_X,
63
-
.info_mask = IIO_CHAN_INFO_OFFSET_SHARED_BIT |
64
-
IIO_CHAN_INFO_SCALE_SHARED_BIT |
65
-
IIO_CHAN_INFO_SAMP_FREQ_SHARED_BIT |
66
-
IIO_CHAN_INFO_HYSTERESIS_SHARED_BIT,
63
+
.info_mask_shared_by_type = BIT(IIO_CHAN_INFO_OFFSET) |
64
+
BIT(IIO_CHAN_INFO_SCALE) |
65
+
BIT(IIO_CHAN_INFO_SAMP_FREQ) |
66
+
BIT(IIO_CHAN_INFO_HYSTERESIS),
67
67
.scan_index = CHANNEL_SCAN_INDEX_X,
68
68
}, {
69
69
.type = IIO_MAGN,
70
70
.modified = 1,
71
71
.channel2 = IIO_MOD_Y,
72
-
.info_mask = IIO_CHAN_INFO_OFFSET_SHARED_BIT |
73
-
IIO_CHAN_INFO_SCALE_SHARED_BIT |
74
-
IIO_CHAN_INFO_SAMP_FREQ_SHARED_BIT |
75
-
IIO_CHAN_INFO_HYSTERESIS_SHARED_BIT,
72
+
.info_mask_shared_by_type = BIT(IIO_CHAN_INFO_OFFSET) |
73
+
BIT(IIO_CHAN_INFO_SCALE) |
74
+
BIT(IIO_CHAN_INFO_SAMP_FREQ) |
75
+
BIT(IIO_CHAN_INFO_HYSTERESIS),
76
76
.scan_index = CHANNEL_SCAN_INDEX_Y,
77
77
}, {
78
78
.type = IIO_MAGN,
79
79
.modified = 1,
80
80
.channel2 = IIO_MOD_Z,
81
-
.info_mask = IIO_CHAN_INFO_OFFSET_SHARED_BIT |
82
-
IIO_CHAN_INFO_SCALE_SHARED_BIT |
83
-
IIO_CHAN_INFO_SAMP_FREQ_SHARED_BIT |
84
-
IIO_CHAN_INFO_HYSTERESIS_SHARED_BIT,
81
+
.info_mask_shared_by_type = BIT(IIO_CHAN_INFO_OFFSET) |
82
+
BIT(IIO_CHAN_INFO_SCALE) |
83
+
BIT(IIO_CHAN_INFO_SAMP_FREQ) |
84
+
BIT(IIO_CHAN_INFO_HYSTERESIS),
85
85
.scan_index = CHANNEL_SCAN_INDEX_Z,
86
86
}
87
87
};