mirror of
https://github.com/torvalds/linux.git
synced 2026-07-28 01:55:51 +02:00
iio: gyro: HID: hid-sensor-gyro-3d: Refactor channel initialization
Replace the local gyro_3d_adjust_channel_bit_mask() function with a compound literal for scan_type initialization to improve code readability. Additionaly, clean up the channel initialization loop by iterating directly over the channel scan indices. Signed-off-by: Natália Salvino André <natalia.andre@ime.usp.br> Co-developed-by: Pietro Di Consolo Gregorio <pietro.gregorio@usp.br> Signed-off-by: Pietro Di Consolo Gregorio <pietro.gregorio@usp.br> Signed-off-by: Jonathan Cameron <jic23@kernel.org>
This commit is contained in:
parent
ab568cb755
commit
3a7f08f66e
|
|
@ -3,6 +3,7 @@
|
|||
* HID Sensors Driver
|
||||
* Copyright (c) 2012, Intel Corporation.
|
||||
*/
|
||||
#include <linux/bitops.h>
|
||||
#include <linux/device.h>
|
||||
#include <linux/platform_device.h>
|
||||
#include <linux/module.h>
|
||||
|
|
@ -82,17 +83,6 @@ static const struct iio_chan_spec gyro_3d_channels[] = {
|
|||
IIO_CHAN_SOFT_TIMESTAMP(CHANNEL_SCAN_INDEX_TIMESTAMP)
|
||||
};
|
||||
|
||||
/* Adjust channel real bits based on report descriptor */
|
||||
static void gyro_3d_adjust_channel_bit_mask(struct iio_chan_spec *channels,
|
||||
int channel, int size)
|
||||
{
|
||||
channels[channel].scan_type.sign = 's';
|
||||
/* Real storage bits will change based on the report desc. */
|
||||
channels[channel].scan_type.realbits = size * 8;
|
||||
/* Maximum size of a sample to capture is u32 */
|
||||
channels[channel].scan_type.storagebits = sizeof(u32) * 8;
|
||||
}
|
||||
|
||||
/* Channel read_raw handler */
|
||||
static int gyro_3d_read_raw(struct iio_dev *indio_dev,
|
||||
struct iio_chan_spec const *chan,
|
||||
|
|
@ -248,19 +238,20 @@ static int gyro_3d_parse_report(struct platform_device *pdev,
|
|||
struct gyro_3d_state *st)
|
||||
{
|
||||
int ret;
|
||||
int i;
|
||||
|
||||
for (i = 0; i <= CHANNEL_SCAN_INDEX_Z; ++i) {
|
||||
for (unsigned int ch = CHANNEL_SCAN_INDEX_X; ch <= CHANNEL_SCAN_INDEX_Z; ch++) {
|
||||
ret = sensor_hub_input_get_attribute_info(hsdev,
|
||||
HID_INPUT_REPORT,
|
||||
usage_id,
|
||||
HID_USAGE_SENSOR_ANGL_VELOCITY_X_AXIS + i,
|
||||
&st->gyro[CHANNEL_SCAN_INDEX_X + i]);
|
||||
HID_USAGE_SENSOR_ANGL_VELOCITY_X_AXIS + ch,
|
||||
&st->gyro[ch]);
|
||||
if (ret < 0)
|
||||
break;
|
||||
gyro_3d_adjust_channel_bit_mask(channels,
|
||||
CHANNEL_SCAN_INDEX_X + i,
|
||||
st->gyro[CHANNEL_SCAN_INDEX_X + i].size);
|
||||
channels[ch].scan_type = (struct iio_scan_type) {
|
||||
.format = 's',
|
||||
.realbits = BYTES_TO_BITS(st->gyro[ch].size),
|
||||
.storagebits = BITS_PER_TYPE(u32),
|
||||
};
|
||||
}
|
||||
dev_dbg(&pdev->dev, "gyro_3d %x:%x, %x:%x, %x:%x\n",
|
||||
st->gyro[0].index,
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user