Re: [PATCH 1/4] staging: comedi: use kmalloc_array instead of kmalloc

[Ian Abbott]

On 08/11/15 14:17, Geliang Tang wrote:
> Use kmalloc_array instead of kmalloc to allocate memory for an array.
>
> Signed-off-by: Geliang Tang <geliangtang@xxxxxxx>
> ---
>   drivers/staging/comedi/drivers/amplc_pci224.c | 8 ++++----
>   drivers/staging/comedi/drivers/ni_670x.c      | 5 +++--
>   2 files changed, 7 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/staging/comedi/drivers/amplc_pci224.c b/drivers/staging/comedi/drivers/amplc_pci224.c
> index b2f7679..d39f02d 100644
> --- a/drivers/staging/comedi/drivers/amplc_pci224.c
> +++ b/drivers/staging/comedi/drivers/amplc_pci224.c
> @@ -1022,14 +1022,14 @@ pci224_auto_attach(struct comedi_device *dev, unsigned long context_model)
>   	irq = pci_dev->irq;
>
>   	/* Allocate buffer to hold values for AO channel scan. */
> -	devpriv->ao_scan_vals = kmalloc(sizeof(devpriv->ao_scan_vals[0]) *
> -					board->ao_chans, GFP_KERNEL);
> +	devpriv->ao_scan_vals = kmalloc_array(board->ao_chans,
> +			sizeof(devpriv->ao_scan_vals[0]), GFP_KERNEL);
>   	if (!devpriv->ao_scan_vals)
>   		return -ENOMEM;
>
>   	/* Allocate buffer to hold AO channel scan order. */
> -	devpriv->ao_scan_order = kmalloc(sizeof(devpriv->ao_scan_order[0]) *
> -					 board->ao_chans, GFP_KERNEL);
> +	devpriv->ao_scan_order = kmalloc_array(board->ao_chans,
> +			sizeof(devpriv->ao_scan_order[0]), GFP_KERNEL);
>   	if (!devpriv->ao_scan_order)
>   		return -ENOMEM;

It would be better if the patch preserved the existing whitespace style 
here, even though that increases the number of lines.

> diff --git a/drivers/staging/comedi/drivers/ni_670x.c b/drivers/staging/comedi/drivers/ni_670x.c
> index f4c580f..3e7271880 100644
> --- a/drivers/staging/comedi/drivers/ni_670x.c
> +++ b/drivers/staging/comedi/drivers/ni_670x.c
> @@ -214,8 +214,9 @@ static int ni_670x_auto_attach(struct comedi_device *dev,
>   	if (s->n_chan == 32) {
>   		const struct comedi_lrange **range_table_list;
>
> -		range_table_list = kmalloc(sizeof(struct comedi_lrange *) * 32,
> -					   GFP_KERNEL);
> +		range_table_list = kmalloc_array(32,
> +						 sizeof(struct comedi_lrange *),
> +						 GFP_KERNEL);
>   		if (!range_table_list)
>   			return -ENOMEM;
>   		s->range_table_list = range_table_list;


--
-=( Ian Abbott @ MEV Ltd.    E-mail: <abbotti@xxxxxxxxx> )=-
-=(                          Web: http://www.mev.co.uk/  )=-
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/