| From foo@baz Mon Jul 26 11:32:24 AM CEST 2021 |
| From: Linus Walleij <linus.walleij@linaro.org> |
| Date: Wed, 11 Dec 2019 22:38:18 +0100 |
| Subject: iio: accel: bma180: Use explicit member assignment |
| |
| From: Linus Walleij <linus.walleij@linaro.org> |
| |
| commit 9436abc40139503a7cea22a96437697d048f31c0 upstream |
| |
| This uses the C99 explicit .member assignment for the |
| variant data in struct bma180_part_info. This makes it |
| easier to understand and add new variants. |
| |
| Cc: Peter Meerwald <pmeerw@pmeerw.net> |
| Cc: Oleksandr Kravchenko <o.v.kravchenko@globallogic.com> |
| Signed-off-by: Linus Walleij <linus.walleij@linaro.org> |
| Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> |
| Signed-off-by: Sudip Mukherjee <sudipm.mukherjee@gmail.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| drivers/iio/accel/bma180.c | 68 +++++++++++++++++++++++++++++---------------- |
| 1 file changed, 44 insertions(+), 24 deletions(-) |
| |
| --- a/drivers/iio/accel/bma180.c |
| +++ b/drivers/iio/accel/bma180.c |
| @@ -626,32 +626,52 @@ static const struct iio_chan_spec bma250 |
| |
| static const struct bma180_part_info bma180_part_info[] = { |
| [BMA180] = { |
| - bma180_channels, ARRAY_SIZE(bma180_channels), |
| - bma180_scale_table, ARRAY_SIZE(bma180_scale_table), |
| - bma180_bw_table, ARRAY_SIZE(bma180_bw_table), |
| - BMA180_CTRL_REG0, BMA180_RESET_INT, |
| - BMA180_CTRL_REG0, BMA180_SLEEP, |
| - BMA180_BW_TCS, BMA180_BW, |
| - BMA180_OFFSET_LSB1, BMA180_RANGE, |
| - BMA180_TCO_Z, BMA180_MODE_CONFIG, BMA180_LOW_POWER, |
| - BMA180_CTRL_REG3, BMA180_NEW_DATA_INT, |
| - BMA180_RESET, |
| - bma180_chip_config, |
| - bma180_chip_disable, |
| + .channels = bma180_channels, |
| + .num_channels = ARRAY_SIZE(bma180_channels), |
| + .scale_table = bma180_scale_table, |
| + .num_scales = ARRAY_SIZE(bma180_scale_table), |
| + .bw_table = bma180_bw_table, |
| + .num_bw = ARRAY_SIZE(bma180_bw_table), |
| + .int_reset_reg = BMA180_CTRL_REG0, |
| + .int_reset_mask = BMA180_RESET_INT, |
| + .sleep_reg = BMA180_CTRL_REG0, |
| + .sleep_mask = BMA180_SLEEP, |
| + .bw_reg = BMA180_BW_TCS, |
| + .bw_mask = BMA180_BW, |
| + .scale_reg = BMA180_OFFSET_LSB1, |
| + .scale_mask = BMA180_RANGE, |
| + .power_reg = BMA180_TCO_Z, |
| + .power_mask = BMA180_MODE_CONFIG, |
| + .lowpower_val = BMA180_LOW_POWER, |
| + .int_enable_reg = BMA180_CTRL_REG3, |
| + .int_enable_mask = BMA180_NEW_DATA_INT, |
| + .softreset_reg = BMA180_RESET, |
| + .chip_config = bma180_chip_config, |
| + .chip_disable = bma180_chip_disable, |
| }, |
| [BMA250] = { |
| - bma250_channels, ARRAY_SIZE(bma250_channels), |
| - bma250_scale_table, ARRAY_SIZE(bma250_scale_table), |
| - bma250_bw_table, ARRAY_SIZE(bma250_bw_table), |
| - BMA250_INT_RESET_REG, BMA250_INT_RESET_MASK, |
| - BMA250_POWER_REG, BMA250_SUSPEND_MASK, |
| - BMA250_BW_REG, BMA250_BW_MASK, |
| - BMA250_RANGE_REG, BMA250_RANGE_MASK, |
| - BMA250_POWER_REG, BMA250_LOWPOWER_MASK, 1, |
| - BMA250_INT_ENABLE_REG, BMA250_DATA_INTEN_MASK, |
| - BMA250_RESET_REG, |
| - bma250_chip_config, |
| - bma250_chip_disable, |
| + .channels = bma250_channels, |
| + .num_channels = ARRAY_SIZE(bma250_channels), |
| + .scale_table = bma250_scale_table, |
| + .num_scales = ARRAY_SIZE(bma250_scale_table), |
| + .bw_table = bma250_bw_table, |
| + .num_bw = ARRAY_SIZE(bma250_bw_table), |
| + .int_reset_reg = BMA250_INT_RESET_REG, |
| + .int_reset_mask = BMA250_INT_RESET_MASK, |
| + .sleep_reg = BMA250_POWER_REG, |
| + .sleep_mask = BMA250_SUSPEND_MASK, |
| + .bw_reg = BMA250_BW_REG, |
| + .bw_mask = BMA250_BW_MASK, |
| + .scale_reg = BMA250_RANGE_REG, |
| + .scale_mask = BMA250_RANGE_MASK, |
| + .power_reg = BMA250_POWER_REG, |
| + .power_mask = BMA250_LOWPOWER_MASK, |
| + .lowpower_val = 1, |
| + .int_enable_reg = BMA250_INT_ENABLE_REG, |
| + .int_enable_mask = BMA250_DATA_INTEN_MASK, |
| + .softreset_reg = BMA250_RESET_REG, |
| + .chip_config = bma250_chip_config, |
| + .chip_disable = bma250_chip_disable, |
| }, |
| }; |
| |