Re: [PATCH 1/2] iio: adc: ti-ads131e08: Use device_for_each_child_node_scoped() to simplify error paths.

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Sat, 20 Apr 2024 15:27:43 -0300
Lorenzo Bertin Salvador <lorenzobs@xxxxxx> wrote:

> This loop definition automatically releases the handle on early exit
> reducing the chance of bugs that cause resource leaks.
> 
> Co-developed-by: Briza Mel Dias de Sousa <brizamel.dias@xxxxxx>
> Signed-off-by: Briza Mel Dias de Sousa <brizamel.dias@xxxxxx>
> Signed-off-by: Lorenzo Bertin Salvador <lorenzobs@xxxxxx>
Good patch.
Applied to the togreg branch of iio.git, but I'll only push it out
as testing today so that 0-day (an autobuilder) can see if it can
find anything that we have missed.

Thanks,

Jonathan

> ---
>  drivers/iio/adc/ti-ads131e08.c | 12 ++++--------
>  1 file changed, 4 insertions(+), 8 deletions(-)
> 
> diff --git a/drivers/iio/adc/ti-ads131e08.c b/drivers/iio/adc/ti-ads131e08.c
> index fcfc46254..cb04a29b3 100644
> --- a/drivers/iio/adc/ti-ads131e08.c
> +++ b/drivers/iio/adc/ti-ads131e08.c
> @@ -694,7 +694,6 @@ static int ads131e08_alloc_channels(struct iio_dev *indio_dev)
>  	struct ads131e08_channel_config *channel_config;
>  	struct device *dev = &st->spi->dev;
>  	struct iio_chan_spec *channels;
> -	struct fwnode_handle *node;
>  	unsigned int channel, tmp;
>  	int num_channels, i, ret;
>  
> @@ -736,10 +735,10 @@ static int ads131e08_alloc_channels(struct iio_dev *indio_dev)
>  		return -ENOMEM;
>  
>  	i = 0;
> -	device_for_each_child_node(dev, node) {
> +	device_for_each_child_node_scoped(dev, node) {
>  		ret = fwnode_property_read_u32(node, "reg", &channel);
>  		if (ret)
> -			goto err_child_out;
> +			return ret;
>  
>  		ret = fwnode_property_read_u32(node, "ti,gain", &tmp);
>  		if (ret) {
> @@ -747,7 +746,7 @@ static int ads131e08_alloc_channels(struct iio_dev *indio_dev)
>  		} else {
>  			ret = ads131e08_pga_gain_to_field_value(st, tmp);
>  			if (ret < 0)
> -				goto err_child_out;
> +				return ret;
>  
>  			channel_config[i].pga_gain = tmp;
>  		}
> @@ -758,7 +757,7 @@ static int ads131e08_alloc_channels(struct iio_dev *indio_dev)
>  		} else {
>  			ret = ads131e08_validate_channel_mux(st, tmp);
>  			if (ret)
> -				goto err_child_out;
> +				return ret;
>  
>  			channel_config[i].mux = tmp;
>  		}
> @@ -785,9 +784,6 @@ static int ads131e08_alloc_channels(struct iio_dev *indio_dev)
>  
>  	return 0;
>  
> -err_child_out:
> -	fwnode_handle_put(node);
> -	return ret;
>  }
>  
>  static void ads131e08_regulator_disable(void *data)





[Index of Archives]     [Linux USB Devel]     [Video for Linux]     [Linux Audio Users]     [Yosemite News]     [Linux Input]     [Linux Kernel]     [Linux SCSI]     [X.org]

  Powered by Linux