| Message ID | 89d8a766eb971eda1ee362444a8711037bdb208c.1626261211.git.christophe.jaillet@wanadoo.fr (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [1/2] iio: buffer: Save a few cycles in 'iio_scan_mask_set()' | expand |
On Wed, 14 Jul 2021 13:14:41 +0200 Christophe JAILLET <christophe.jaillet@wanadoo.fr> wrote: > Use 'bitmap_alloc()' instead of 'bitmap_zalloc()' because the bitmap > is fully overridden by a 'bitmap_copy()' call just after its allocation. > > While at it, fix the style of a NULL check. > > Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> Applied to the togreg branch of iio.git and pushed out as testing for the autobuilders to poke at it. Thanks, Jonathan > --- > drivers/iio/industrialio-buffer.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/iio/industrialio-buffer.c b/drivers/iio/industrialio-buffer.c > index fdd623407b96..6d4776a7f002 100644 > --- a/drivers/iio/industrialio-buffer.c > +++ b/drivers/iio/industrialio-buffer.c > @@ -354,8 +354,8 @@ static int iio_scan_mask_set(struct iio_dev *indio_dev, > const unsigned long *mask; > unsigned long *trialmask; > > - trialmask = bitmap_zalloc(indio_dev->masklength, GFP_KERNEL); > - if (trialmask == NULL) > + trialmask = bitmap_alloc(indio_dev->masklength, GFP_KERNEL); > + if (!trialmask) > return -ENOMEM; > if (!indio_dev->masklength) { > WARN(1, "Trying to set scanmask prior to registering buffer\n");
diff --git a/drivers/iio/industrialio-buffer.c b/drivers/iio/industrialio-buffer.c index fdd623407b96..6d4776a7f002 100644 --- a/drivers/iio/industrialio-buffer.c +++ b/drivers/iio/industrialio-buffer.c @@ -354,8 +354,8 @@ static int iio_scan_mask_set(struct iio_dev *indio_dev, const unsigned long *mask; unsigned long *trialmask; - trialmask = bitmap_zalloc(indio_dev->masklength, GFP_KERNEL); - if (trialmask == NULL) + trialmask = bitmap_alloc(indio_dev->masklength, GFP_KERNEL); + if (!trialmask) return -ENOMEM; if (!indio_dev->masklength) { WARN(1, "Trying to set scanmask prior to registering buffer\n");
Use 'bitmap_alloc()' instead of 'bitmap_zalloc()' because the bitmap is fully overridden by a 'bitmap_copy()' call just after its allocation. While at it, fix the style of a NULL check. Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> --- drivers/iio/industrialio-buffer.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)