Skip to content

Commit 137a83a

Browse files
dumitruceclanjic23
authored andcommitted
iio: adc: ad7173: refactor channel configuration parsing
Move configurations regarding number of channels from *_fw_parse_device_config to *_fw_parse_channel_config. Suggested-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> Link: https://lore.kernel.org/all/20240303162148.3ad91aa2@jic23-huawei/ Reviewed-by: David Lechner <dlechner@baylibre.com> Reviewed-by: Nuno Sa <nuno.sa@analog.com> Signed-off-by: Dumitru Ceclan <dumitru.ceclan@analog.com> Link: https://patch.msgid.link/20240607-ad4111-v7-4-97e3855900a0@analog.com Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
1 parent 98a563d commit 137a83a

File tree

1 file changed

+17
-12
lines changed

1 file changed

+17
-12
lines changed

drivers/iio/adc/ad7173.c

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -912,7 +912,23 @@ static int ad7173_fw_parse_channel_config(struct iio_dev *indio_dev)
912912
struct device *dev = indio_dev->dev.parent;
913913
struct iio_chan_spec *chan_arr, *chan;
914914
unsigned int ain[2], chan_index = 0;
915-
int ref_sel, ret;
915+
int ref_sel, ret, num_channels;
916+
917+
num_channels = device_get_child_node_count(dev);
918+
919+
if (st->info->has_temp)
920+
num_channels++;
921+
922+
if (num_channels == 0)
923+
return dev_err_probe(dev, -ENODATA, "No channels specified\n");
924+
925+
if (num_channels > st->info->num_channels)
926+
return dev_err_probe(dev, -EINVAL,
927+
"Too many channels specified. Maximum is %d, not including temperature channel if supported.\n",
928+
st->info->num_channels);
929+
930+
indio_dev->num_channels = num_channels;
931+
st->num_channels = num_channels;
916932

917933
chan_arr = devm_kcalloc(dev, sizeof(*indio_dev->channels),
918934
st->num_channels, GFP_KERNEL);
@@ -1007,7 +1023,6 @@ static int ad7173_fw_parse_device_config(struct iio_dev *indio_dev)
10071023
{
10081024
struct ad7173_state *st = iio_priv(indio_dev);
10091025
struct device *dev = indio_dev->dev.parent;
1010-
unsigned int num_channels;
10111026
int ret;
10121027

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

10671082
ad7173_sigma_delta_info.irq_line = ret;
10681083

1069-
num_channels = device_get_child_node_count(dev);
1070-
1071-
if (st->info->has_temp)
1072-
num_channels++;
1073-
1074-
if (num_channels == 0)
1075-
return dev_err_probe(dev, -ENODATA, "No channels specified\n");
1076-
indio_dev->num_channels = num_channels;
1077-
st->num_channels = num_channels;
1078-
10791084
return ad7173_fw_parse_channel_config(indio_dev);
10801085
}
10811086

0 commit comments

Comments
 (0)