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

Replace the local prox_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-prox.c b/drivers/iio/light/hid-sensor-prox.c
index efa904a70d0efb2a2f1218cd6fd6c5781fecf7d1..edc9274a2c0767990c2122a42e30811ce61d3f4c 100644 (file)
--- a/drivers/iio/light/hid-sensor-prox.c
+++ b/drivers/iio/light/hid-sensor-prox.c
@@ -3,6 +3,7 @@
  * HID Sensors Driver
  * Copyright (c) 2014, Intel Corporation.
  */
+#include <linux/bitops.h>
 #include <linux/device.h>
 #include <linux/platform_device.h>
 #include <linux/module.h>
@@ -67,17 +68,6 @@ static const struct iio_chan_spec prox_channels[] = {
        PROX_CHANNEL(false, 0),
 };
 
-/* Adjust channel real bits based on report descriptor */
-static void prox_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 prox_read_raw(struct iio_dev *indio_dev,
                              struct iio_chan_spec const *chan,
@@ -250,8 +240,11 @@ static int prox_parse_report(struct platform_device *pdev,
                st->scan_mask[0] |= BIT(index);
                channels[index] = prox_channels[i];
                channels[index].scan_index = index;
-               prox_adjust_channel_bit_mask(channels, index,
-                                            st->prox_attr[index].size);
+               channels[index].scan_type = (struct iio_scan_type) {
+                       .format = 's',
+                       .realbits = BYTES_TO_BITS(st->prox_attr[index].size),
+                       .storagebits = BITS_PER_TYPE(u32),
+               };
                dev_dbg(&pdev->dev, "prox %x:%x\n", st->prox_attr[index].index,
                        st->prox_attr[index].report_id);
                st->scale_precision[index] =