lkml.org 
[lkml]   [2024]   [Apr]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Date
    Subject[PATCH 3/6] iio: adc: ad7173: refactor channel configuration parsing
    From: Dumitru Ceclan <dumitru.ceclan@analog.com>

    Move configurations regarding number of channels from
    *_fw_parse_device_config to *_fw_parse_channel_config.

    Signed-off-by: Dumitru Ceclan <dumitru.ceclan@analog.com>
    ---
    drivers/iio/adc/ad7173.c | 29 +++++++++++++++++------------
    1 file changed, 17 insertions(+), 12 deletions(-)

    diff --git a/drivers/iio/adc/ad7173.c b/drivers/iio/adc/ad7173.c
    index 8a95b1391826..699bc6970790 100644
    --- a/drivers/iio/adc/ad7173.c
    +++ b/drivers/iio/adc/ad7173.c
    @@ -917,7 +917,23 @@ static int ad7173_fw_parse_channel_config(struct iio_dev *indio_dev)
    struct device *dev = indio_dev->dev.parent;
    struct iio_chan_spec *chan_arr, *chan;
    unsigned int ain[2], chan_index = 0;
    - int ref_sel, ret;
    + int ref_sel, ret, num_channels;
    +
    + num_channels = device_get_child_node_count(dev);
    +
    + if (st->info->has_temp)
    + num_channels++;
    +
    + if (num_channels == 0)
    + return dev_err_probe(dev, -ENODATA, "No channels specified\n");
    +
    + if (num_channels > st->info->num_channels)
    + return dev_err_probe(dev, -EINVAL,
    + "Too many channels specified. Maximum is %d, not including temperature channel if supported.\n",
    + st->info->num_channels);
    +
    + indio_dev->num_channels = num_channels;
    + st->num_channels = num_channels;

    chan_arr = devm_kcalloc(dev, sizeof(*indio_dev->channels),
    st->num_channels, GFP_KERNEL);
    @@ -1012,7 +1028,6 @@ static int ad7173_fw_parse_device_config(struct iio_dev *indio_dev)
    {
    struct ad7173_state *st = iio_priv(indio_dev);
    struct device *dev = indio_dev->dev.parent;
    - unsigned int num_channels;
    int ret;

    st->regulators[0].supply = ad7173_ref_sel_str[AD7173_SETUP_REF_SEL_EXT_REF];
    @@ -1071,16 +1086,6 @@ static int ad7173_fw_parse_device_config(struct iio_dev *indio_dev)

    ad7173_sigma_delta_info.irq_line = ret;

    - num_channels = device_get_child_node_count(dev);
    -
    - if (st->info->has_temp)
    - num_channels++;
    -
    - if (num_channels == 0)
    - return dev_err_probe(dev, -ENODATA, "No channels specified\n");
    - indio_dev->num_channels = num_channels;
    - st->num_channels = num_channels;
    -
    return ad7173_fw_parse_channel_config(indio_dev);
    }

    --
    2.43.0



    \
     
     \ /
      Last update: 2024-05-27 16:18    [W:3.297 / U:0.032 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site