The ad7280_attr_init function has been split into more specific functions to increase the code readability. Signed-off-by: Slawomir Stepien <sst@xxxxxxxxx> --- drivers/staging/iio/adc/ad7280a.c | 79 +++++++++++++++++++------------ 1 file changed, 48 insertions(+), 31 deletions(-) diff --git a/drivers/staging/iio/adc/ad7280a.c b/drivers/staging/iio/adc/ad7280a.c index a6b1bdd9f372..6faa85bf6f7e 100644 --- a/drivers/staging/iio/adc/ad7280a.c +++ b/drivers/staging/iio/adc/ad7280a.c @@ -592,11 +592,49 @@ static int ad7280_channel_init(struct ad7280_state *st) return cnt + 1; } +static int ad7280_balance_switch_attr_init(struct ad7280_state *st, int cnt, + int dev, int ch) +{ + struct iio_dev_attr *attr = &st->iio_attr[cnt]; + + attr->address = ad7280a_devaddr(dev) << 8 | ch; + attr->dev_attr.attr.mode = 0644; + attr->dev_attr.show = ad7280_show_balance_sw; + attr->dev_attr.store = ad7280_store_balance_sw; + attr->dev_attr.attr.name = devm_kasprintf(&st->spi->dev, GFP_KERNEL, + "in%d-in%d_balance_switch_en", + ch, ch + 1); + if (!attr->dev_attr.attr.name) + return -ENOMEM; + + ad7280_attributes[cnt] = &attr->dev_attr.attr; + + return 0; +} + +static int ad7280_balance_timer_attr_init(struct ad7280_state *st, int cnt, + int dev, int ch) +{ + struct iio_dev_attr *attr = &st->iio_attr[cnt]; + + attr->address = ad7280a_devaddr(dev) << 8 | (AD7280A_CB1_TIMER + ch); + attr->dev_attr.attr.mode = 0644; + attr->dev_attr.show = ad7280_show_balance_timer; + attr->dev_attr.store = ad7280_store_balance_timer; + attr->dev_attr.attr.name = devm_kasprintf(&st->spi->dev, GFP_KERNEL, + "in%d-in%d_balance_timer", + ch, ch + 1); + if (!attr->dev_attr.attr.name) + return -ENOMEM; + + ad7280_attributes[cnt] = &attr->dev_attr.attr; + + return 0; +} + static int ad7280_attr_init(struct ad7280_state *st) { - int dev, ch, cnt; - unsigned int index; - struct iio_dev_attr *iio_attr; + int dev, ch, cnt, ret; st->iio_attr = devm_kcalloc(&st->spi->dev, 2, sizeof(*st->iio_attr) * (st->slave_num + 1) * AD7280A_CELLS_PER_DEV, @@ -607,35 +645,14 @@ static int ad7280_attr_init(struct ad7280_state *st) for (dev = 0, cnt = 0; dev <= st->slave_num; dev++) for (ch = AD7280A_CELL_VOLTAGE_1; ch <= AD7280A_CELL_VOLTAGE_6; ch++, cnt++) { - iio_attr = &st->iio_attr[cnt]; - index = dev * AD7280A_CELLS_PER_DEV + ch; - iio_attr->address = ad7280a_devaddr(dev) << 8 | ch; - iio_attr->dev_attr.attr.mode = 0644; - iio_attr->dev_attr.show = ad7280_show_balance_sw; - iio_attr->dev_attr.store = ad7280_store_balance_sw; - iio_attr->dev_attr.attr.name = - devm_kasprintf(&st->spi->dev, GFP_KERNEL, - "in%d-in%d_balance_switch_en", - index, index + 1); - if (!iio_attr->dev_attr.attr.name) - return -ENOMEM; - - ad7280_attributes[cnt] = &iio_attr->dev_attr.attr; + ret = ad7280_balance_switch_attr_init(st, cnt, dev, ch); + if (ret < 0) + return ret; + cnt++; - iio_attr = &st->iio_attr[cnt]; - iio_attr->address = ad7280a_devaddr(dev) << 8 | - (AD7280A_CB1_TIMER + ch); - iio_attr->dev_attr.attr.mode = 0644; - iio_attr->dev_attr.show = ad7280_show_balance_timer; - iio_attr->dev_attr.store = ad7280_store_balance_timer; - iio_attr->dev_attr.attr.name = - devm_kasprintf(&st->spi->dev, GFP_KERNEL, - "in%d-in%d_balance_timer", - index, index + 1); - if (!iio_attr->dev_attr.attr.name) - return -ENOMEM; - - ad7280_attributes[cnt] = &iio_attr->dev_attr.attr; + ret = ad7280_balance_timer_attr_init(st, cnt, dev, ch); + if (ret < 0) + return ret; } ad7280_attributes[cnt] = NULL; -- 2.19.2