iio: light: HID: hid-sensor-als: Refactor channel initialization

Replace the local als_adjust_channel_bit_mask() function with a
compound literal for scan_type initialization to improve code
readability.

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>

diff --git a/drivers/iio/light/hid-sensor-als.c b/drivers/iio/light/hid-sensor-als.c
index 384572844162c637d2200b261accb78b67396ab1..d72e260b826682e0ddb39e3ed83059089e78acf7 100644 (file)
--- a/drivers/iio/light/hid-sensor-als.c
+++ b/drivers/iio/light/hid-sensor-als.c
@@ -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>
@@ -117,17 +118,6 @@ static const struct iio_chan_spec als_channels[] = {
        IIO_CHAN_SOFT_TIMESTAMP(CHANNEL_SCAN_INDEX_TIMESTAMP)
 };
 
-/* Adjust channel real bits based on report descriptor */
-static void als_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 als_read_raw(struct iio_dev *indio_dev,
                              struct iio_chan_spec const *chan,
@@ -335,7 +325,11 @@ static int als_parse_report(struct platform_device *pdev,
 
                channels[index] = als_channels[i];
                st->als_scan_mask[0] |= BIT(i);
-               als_adjust_channel_bit_mask(channels, index, st->als[i].size);
+               channels[index].scan_type = (struct iio_scan_type) {
+                       .format = 's',
+                       .realbits = BYTES_TO_BITS(st->als[i].size),
+                       .storagebits = BITS_PER_TYPE(u32),
+               };
                ++index;
 
                dev_dbg(&pdev->dev, "als %x:%x\n", st->als[i].index,