UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

iio: adc: xilinx-xadc: Drop duplicate NULL check in xadc_parse_dt() 

The fwnode_for_each_child_node() is NULL-aware, no need to check
its parameters outside. Drop duplicate NULL check in xadc_parse_dt().

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://lore.kernel.org/r/20220531141118.64540-2-andriy.shevchenko@linux.intel.com
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
This commit is contained in:
Andy Shevchenko 2022-05-31 17:11:18 +03:00 committed by Jonathan Cameron
parent 59b2947ed4
commit 568f6869e6
1 changed files with 21 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
drivers/iio/adc/xilinx-xadc-core.c
View File

@ -1247,30 +1247,28 @@ static int xadc_parse_dt(struct iio_dev *indio_dev, unsigned int *conf, int irq)
chan = &channels[9]; chan = &channels[9];
chan_node = device_get_named_child_node(dev, "xlnx,channels"); chan_node = device_get_named_child_node(dev, "xlnx,channels");
if (chan_node) { fwnode_for_each_child_node(chan_node, child) {
fwnode_for_each_child_node(chan_node, child) { if (num_channels >= max_channels) {
if (num_channels >= max_channels) { fwnode_handle_put(child);
fwnode_handle_put(child); break;
break;
}
ret = fwnode_property_read_u32(child, "reg", &reg);
if (ret || reg > 16)
continue;
if (fwnode_property_read_bool(child, "xlnx,bipolar"))
chan->scan_type.sign = 's';
if (reg == 0) {
chan->scan_index = 11;
chan->address = XADC_REG_VPVN;
} else {
chan->scan_index = 15 + reg;
chan->address = XADC_REG_VAUX(reg - 1);
}
num_channels++;
chan++;
} }
ret = fwnode_property_read_u32(child, "reg", &reg);
if (ret || reg > 16)
continue;
if (fwnode_property_read_bool(child, "xlnx,bipolar"))
chan->scan_type.sign = 's';
if (reg == 0) {
chan->scan_index = 11;
chan->address = XADC_REG_VPVN;
} else {
chan->scan_index = 15 + reg;
chan->address = XADC_REG_VAUX(reg - 1);
}
num_channels++;
chan++;
} }
fwnode_handle_put(chan_node); fwnode_handle_put(chan_node);