From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752447AbbKKOJl (ORCPT ); Wed, 11 Nov 2015 09:09:41 -0500 Received: from smtp73.iad3a.emailsrvr.com ([173.203.187.73]:58903 "EHLO smtp73.iad3a.emailsrvr.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751386AbbKKOJZ (ORCPT ); Wed, 11 Nov 2015 09:09:25 -0500 X-Auth-ID: abbotti@mev.co.uk X-Sender-Id: abbotti@mev.co.uk Subject: Re: [PATCH v2] staging: comedi: use kmalloc_array instead of kmalloc To: Geliang Tang , H Hartley Sweeten , Greg Kroah-Hartman References: Cc: devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org From: Ian Abbott Message-ID: <56434C13.3070808@mev.co.uk> Date: Wed, 11 Nov 2015 14:09:23 +0000 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:38.0) Gecko/20100101 Thunderbird/38.2.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 10/11/2015 14:41, Geliang Tang wrote: > Use kmalloc_array instead of kmalloc to allocate memory for an array. > > Signed-off-by: Geliang Tang > > --- > Changes in v2: > - preserve the existing whitespace style. > --- > drivers/staging/comedi/drivers/amplc_pci224.c | 11 +++++++---- > drivers/staging/comedi/drivers/ni_670x.c | 5 +++-- > 2 files changed, 10 insertions(+), 6 deletions(-) > > diff --git a/drivers/staging/comedi/drivers/amplc_pci224.c b/drivers/staging/comedi/drivers/amplc_pci224.c > index b2f7679..cac011f 100644 > --- a/drivers/staging/comedi/drivers/amplc_pci224.c > +++ b/drivers/staging/comedi/drivers/amplc_pci224.c > @@ -1022,14 +1022,17 @@ 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; > > 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; > Seems fine! Reviewed-by: Ian Abbott -- -=( Ian Abbott @ MEV Ltd. E-mail: )=- -=( Web: http://www.mev.co.uk/ )=-