Re: [PATCH v1 2/2] iio: core: Calculate alloc_size only once in iio_device_alloc()

[Christophe JAILLET]

Le 04/03/2024 à 15:04, Andy Shevchenko a écrit :
> No need to rewrite the value, instead use 'else' branch.
> This will also help further refactoring the code later on.
>
> Signed-off-by: Andy Shevchenko <andriy.shevchenko-VuQAYsv1563Yd54FQh9/CA@xxxxxxxxxxxxxxxx>
> ---
>   drivers/iio/industrialio-core.c | 9 ++++-----
>   1 file changed, 4 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/iio/industrialio-core.c b/drivers/iio/industrialio-core.c
> index 8684ba246969..c7ad88932015 100644
> --- a/drivers/iio/industrialio-core.c
> +++ b/drivers/iio/industrialio-core.c
> @@ -1643,11 +1643,10 @@ struct iio_dev *iio_device_alloc(struct device *parent, int sizeof_priv)
>   	struct iio_dev *indio_dev;
>   	size_t alloc_size;
>   
> -	alloc_size = sizeof(struct iio_dev_opaque);
> -	if (sizeof_priv) {
> -		alloc_size = ALIGN(alloc_size, IIO_DMA_MINALIGN);
> -		alloc_size += sizeof_priv;
> -	}
> +	if (sizeof_priv)
> +		alloc_size = ALIGN(sizeof(*iio_dev_opaque), IIO_DMA_MINALIGN) + sizeof_priv;

maybe size_add() to be super-safe?

CJ

> +	else
> +		alloc_size = sizeof(*iio_dev_opaque);
>   
>   	iio_dev_opaque = kzalloc(alloc_size, GFP_KERNEL);
>   	if (!iio_dev_opaque)