iio: pressure: HID: hid-sensor-press: Refactor channel initialization

Replace the local press_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/pressure/hid-sensor-press.c b/drivers/iio/pressure/hid-sensor-press.c
index 5f1d6abda3e408e652fc22e9681ca7ea9d7d6c40..a039b99d9851d726579d00255a9cb0ba2d9c06d9 100644 (file)
--- a/drivers/iio/pressure/hid-sensor-press.c
+++ b/drivers/iio/pressure/hid-sensor-press.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>
@@ -53,17 +54,6 @@ static const struct iio_chan_spec press_channels[] = {
 
 };
 
-/* Adjust channel real bits based on report descriptor */
-static void press_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 press_read_raw(struct iio_dev *indio_dev,
                              struct iio_chan_spec const *chan,
@@ -225,8 +215,11 @@ static int press_parse_report(struct platform_device *pdev,
                        &st->press_attr);
        if (ret < 0)
                return ret;
-       press_adjust_channel_bit_mask(channels, CHANNEL_SCAN_INDEX_PRESSURE,
-                                       st->press_attr.size);
+       channels[CHANNEL_SCAN_INDEX_PRESSURE].scan_type = (struct iio_scan_type) {
+               .format = 's',
+               .realbits = BYTES_TO_BITS(st->press_attr.size),
+               .storagebits = BITS_PER_TYPE(u32),
+       };
 
        dev_dbg(&pdev->dev, "press %x:%x\n", st->press_attr.index,
                        st->press_attr.report_id);