| Message ID | 20200317123621.27722-1-alexandru.ardelean@analog.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | iio: buffer: re-introduce bitmap_zalloc() for trialmask | expand |
On Tue, Mar 17, 2020 at 02:36:21PM +0200, Alexandru Ardelean wrote: > Commit 3862828a903d3 ("iio: buffer: Switch to bitmap_zalloc()") introduced > bitmap_alloc(), but commit 20ea39ef9f2f9 ("iio: Fix scan mask selection") > reverted it. > > This change adds it back. The only difference is that it's adding > bitmap_zalloc(). There might be some changes later that would require > initializing it to zero. In any case, now it's already zero-ing the > trialmask. FWIW, Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> > > Signed-off-by: Alexandru Ardelean <alexandru.ardelean@analog.com> > --- > drivers/iio/industrialio-buffer.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/drivers/iio/industrialio-buffer.c b/drivers/iio/industrialio-buffer.c > index 4ada5592aa2b..5ff34ce8b6a2 100644 > --- a/drivers/iio/industrialio-buffer.c > +++ b/drivers/iio/industrialio-buffer.c > @@ -316,8 +316,7 @@ static int iio_scan_mask_set(struct iio_dev *indio_dev, > const unsigned long *mask; > unsigned long *trialmask; > > - trialmask = kcalloc(BITS_TO_LONGS(indio_dev->masklength), > - sizeof(*trialmask), GFP_KERNEL); > + trialmask = bitmap_zalloc(indio_dev->masklength, GFP_KERNEL); > if (trialmask == NULL) > return -ENOMEM; > if (!indio_dev->masklength) { > -- > 2.20.1 >
On Tue, 2020-03-17 at 14:52 +0200, Andy Shevchenko wrote: > [External] > > On Tue, Mar 17, 2020 at 02:36:21PM +0200, Alexandru Ardelean wrote: > > Commit 3862828a903d3 ("iio: buffer: Switch to bitmap_zalloc()") introduced > > bitmap_alloc(), but commit 20ea39ef9f2f9 ("iio: Fix scan mask selection") > > reverted it. > > > > This change adds it back. The only difference is that it's adding > > bitmap_zalloc(). There might be some changes later that would require > > initializing it to zero. In any case, now it's already zero-ing the > > trialmask. > > FWIW, > Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Thanks. And sorry for the hiccup back there. > > > Signed-off-by: Alexandru Ardelean <alexandru.ardelean@analog.com> > > --- > > drivers/iio/industrialio-buffer.c | 3 +-- > > 1 file changed, 1 insertion(+), 2 deletions(-) > > > > diff --git a/drivers/iio/industrialio-buffer.c b/drivers/iio/industrialio- > > buffer.c > > index 4ada5592aa2b..5ff34ce8b6a2 100644 > > --- a/drivers/iio/industrialio-buffer.c > > +++ b/drivers/iio/industrialio-buffer.c > > @@ -316,8 +316,7 @@ static int iio_scan_mask_set(struct iio_dev *indio_dev, > > const unsigned long *mask; > > unsigned long *trialmask; > > > > - trialmask = kcalloc(BITS_TO_LONGS(indio_dev->masklength), > > - sizeof(*trialmask), GFP_KERNEL); > > + trialmask = bitmap_zalloc(indio_dev->masklength, GFP_KERNEL); > > if (trialmask == NULL) > > return -ENOMEM; > > if (!indio_dev->masklength) { > > -- > > 2.20.1 > >
On 3/17/20 1:53 PM, Ardelean, Alexandru wrote: > On Tue, 2020-03-17 at 14:52 +0200, Andy Shevchenko wrote: >> [External] >> >> On Tue, Mar 17, 2020 at 02:36:21PM +0200, Alexandru Ardelean wrote: >>> Commit 3862828a903d3 ("iio: buffer: Switch to bitmap_zalloc()") introduced >>> bitmap_alloc(), but commit 20ea39ef9f2f9 ("iio: Fix scan mask selection") >>> reverted it. >>> >>> This change adds it back. The only difference is that it's adding >>> bitmap_zalloc(). There might be some changes later that would require >>> initializing it to zero. In any case, now it's already zero-ing the >>> trialmask. >> >> FWIW, >> Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> > > Thanks. > And sorry for the hiccup back there. It looks like a merge conflict. Both patches are in parallel sub-trees. I guess one went through fixes and the other through the normal tree and then when they were merged, the issue was not resolved properly. 2019-04-21 Greg Kroah-Hartman M─┐ Merge 5.1-rc6 into staging-next 2019-02-20 Lars-Peter Clausen │ o iio: Fix scan mask selection 2019-03-04 Andy Shevchenko o │ iio: buffer: Switch to bitmap_zalloc 2018-02-20 Greg Kroah-Hartman M─┤ Merge tag 'iio-fixes-for-4.16a
On Tue, 17 Mar 2020 14:18:43 +0100 Lars-Peter Clausen <lars@metafoo.de> wrote: > On 3/17/20 1:53 PM, Ardelean, Alexandru wrote: > > On Tue, 2020-03-17 at 14:52 +0200, Andy Shevchenko wrote: > >> [External] > >> > >> On Tue, Mar 17, 2020 at 02:36:21PM +0200, Alexandru Ardelean wrote: > >>> Commit 3862828a903d3 ("iio: buffer: Switch to bitmap_zalloc()") introduced > >>> bitmap_alloc(), but commit 20ea39ef9f2f9 ("iio: Fix scan mask selection") > >>> reverted it. > >>> > >>> This change adds it back. The only difference is that it's adding > >>> bitmap_zalloc(). There might be some changes later that would require > >>> initializing it to zero. In any case, now it's already zero-ing the > >>> trialmask. > >> > >> FWIW, > >> Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> > > > > Thanks. > > And sorry for the hiccup back there. > > It looks like a merge conflict. Both patches are in parallel sub-trees. > I guess one went through fixes and the other through the normal tree and > then when they were merged, the issue was not resolved properly. > > 2019-04-21 Greg Kroah-Hartman M─┐ Merge 5.1-rc6 into staging-next > 2019-02-20 Lars-Peter Clausen │ o iio: Fix scan mask selection > 2019-03-04 Andy Shevchenko o │ iio: buffer: Switch to bitmap_zalloc > 2018-02-20 Greg Kroah-Hartman M─┤ Merge tag 'iio-fixes-for-4.16a Thanks for the detective work. I've added a note to the patch description. Jonathan
diff --git a/drivers/iio/industrialio-buffer.c b/drivers/iio/industrialio-buffer.c index 4ada5592aa2b..5ff34ce8b6a2 100644 --- a/drivers/iio/industrialio-buffer.c +++ b/drivers/iio/industrialio-buffer.c @@ -316,8 +316,7 @@ static int iio_scan_mask_set(struct iio_dev *indio_dev, const unsigned long *mask; unsigned long *trialmask; - trialmask = kcalloc(BITS_TO_LONGS(indio_dev->masklength), - sizeof(*trialmask), GFP_KERNEL); + trialmask = bitmap_zalloc(indio_dev->masklength, GFP_KERNEL); if (trialmask == NULL) return -ENOMEM; if (!indio_dev->masklength) {
Commit 3862828a903d3 ("iio: buffer: Switch to bitmap_zalloc()") introduced bitmap_alloc(), but commit 20ea39ef9f2f9 ("iio: Fix scan mask selection") reverted it. This change adds it back. The only difference is that it's adding bitmap_zalloc(). There might be some changes later that would require initializing it to zero. In any case, now it's already zero-ing the trialmask. Signed-off-by: Alexandru Ardelean <alexandru.ardelean@analog.com> --- drivers/iio/industrialio-buffer.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)