]> git.proxmox.com Git - mirror_ubuntu-hirsute-kernel.git/commitdiff
iio: accel: STK8BA50: replace scale table with a struct
authorTiberiu Breana <tiberiu.a.breana@intel.com>
Wed, 10 Jun 2015 15:07:29 +0000 (18:07 +0300)
committerJonathan Cameron <jic23@kernel.org>
Sun, 14 Jun 2015 10:22:57 +0000 (11:22 +0100)
Replaced the stk8ba50_scale_table with an identically named
struct in order to make the code a bit more readable.

Signed-off-by: Tiberiu Breana <tiberiu.a.breana@intel.com>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
drivers/iio/accel/stk8ba50.c

index 30950c6b36de1f36ac709c4a3548d0a804cb2ccf..3302a3d1b4bff17fc2a73ed41e7c19c05fad03a8 100644 (file)
  *
  * Locally, the range is stored as a table index.
  */
-static const int stk8ba50_scale_table[][2] = {
+static const struct {
+       u8 reg_val;
+       u32 scale_val;
+} stk8ba50_scale_table[] = {
        {3, 38400}, {5, 76700}, {8, 153400}, {12, 306900}
 };
 
@@ -114,7 +117,7 @@ static int stk8ba50_read_raw(struct iio_dev *indio_dev,
                return IIO_VAL_INT;
        case IIO_CHAN_INFO_SCALE:
                *val = 0;
-               *val2 = stk8ba50_scale_table[data->range][1];
+               *val2 = stk8ba50_scale_table[data->range].scale_val;
                return IIO_VAL_INT_PLUS_MICRO;
        }
 
@@ -136,7 +139,7 @@ static int stk8ba50_write_raw(struct iio_dev *indio_dev,
                        return -EINVAL;
 
                for (i = 0; i < ARRAY_SIZE(stk8ba50_scale_table); i++)
-                       if (val2 == stk8ba50_scale_table[i][1]) {
+                       if (val2 == stk8ba50_scale_table[i].scale_val) {
                                index = i;
                                break;
                        }
@@ -145,7 +148,7 @@ static int stk8ba50_write_raw(struct iio_dev *indio_dev,
 
                ret = i2c_smbus_write_byte_data(data->client,
                                STK8BA50_REG_RANGE,
-                               stk8ba50_scale_table[index][0]);
+                               stk8ba50_scale_table[index].reg_val);
                if (ret < 0)
                        dev_err(&data->client->dev,
                                        "failed to set measurement range\n");