]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
iio: adc: ad5755: use scoped device_for_each_child_node()
authorJavier Carrasco <javier.carrasco.cruz@gmail.com>
Thu, 26 Sep 2024 16:08:40 +0000 (18:08 +0200)
committerJonathan Cameron <Jonathan.Cameron@huawei.com>
Sat, 5 Oct 2024 11:09:14 +0000 (12:09 +0100)
Switch to device_for_each_child_node_scoped() to simplify the code by
removing the need for calls to fwnode_handle_put() in the error path, in
this particular case dropping the jump to error_out as well.

This prevents possible memory leaks if new error paths are added without
the required call to fwnode_handle_put().

Signed-off-by: Javier Carrasco <javier.carrasco.cruz@gmail.com>
Link: https://patch.msgid.link/20240926-iio_device_for_each_child_node_scoped-v1-4-64ca8a424578@gmail.com
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
drivers/iio/dac/ad5755.c

index 0b24cb19ac9d1c8032e3dd6354f7b86cd47088b1..05e80b6ae2cc3fe2be68e5477e95047889e3ef83 100644 (file)
@@ -699,7 +699,6 @@ static const struct ad5755_platform_data ad5755_default_pdata = {
 
 static struct ad5755_platform_data *ad5755_parse_fw(struct device *dev)
 {
-       struct fwnode_handle *pp;
        struct ad5755_platform_data *pdata;
        unsigned int tmp;
        unsigned int tmparray[3];
@@ -746,11 +745,12 @@ static struct ad5755_platform_data *ad5755_parse_fw(struct device *dev)
        }
 
        devnr = 0;
-       device_for_each_child_node(dev, pp) {
+       device_for_each_child_node_scoped(dev, pp) {
                if (devnr >= AD5755_NUM_CHANNELS) {
                        dev_err(dev,
                                "There are too many channels defined in DT\n");
-                       goto error_out;
+                       devm_kfree(dev, pdata);
+                       return NULL;
                }
 
                pdata->dac[devnr].mode = AD5755_MODE_CURRENT_4mA_20mA;
@@ -800,11 +800,6 @@ static struct ad5755_platform_data *ad5755_parse_fw(struct device *dev)
        }
 
        return pdata;
-
- error_out:
-       fwnode_handle_put(pp);
-       devm_kfree(dev, pdata);
-       return NULL;
 }
 
 static int ad5755_probe(struct spi_device *spi)