From: Bartosz Golaszewski <brgl@bgdev.pl>
To: Jonathan Cameron <jic23@kernel.org>,
Lars-Peter Clausen <lars@metafoo.de>,
Peter Meerwald-Stadler <pmeerw@pmeerw.net>,
Michal Simek <michal.simek@xilinx.com>
Cc: linux-iio@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org,
Bartosz Golaszewski <bgolaszewski@baylibre.com>
Subject: [PATCH v2 3/4] iio: adc: xilinx: use devm_krealloc_array() instead of kfree() + kcalloc()
Date: Mon, 2 Nov 2020 15:22:27 +0100 [thread overview]
Message-ID: <20201102142228.14949-4-brgl@bgdev.pl> (raw)
In-Reply-To: <20201102142228.14949-1-brgl@bgdev.pl>
From: Bartosz Golaszewski <bgolaszewski@baylibre.com>
We now have devm_krealloc_array() in the kernel Use it indstead of calling
kfree() and kcalloc() separately.
Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com>
---
drivers/iio/adc/xilinx-xadc-core.c | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/drivers/iio/adc/xilinx-xadc-core.c b/drivers/iio/adc/xilinx-xadc-core.c
index 8494eb424b33..7792aa4cf9cb 100644
--- a/drivers/iio/adc/xilinx-xadc-core.c
+++ b/drivers/iio/adc/xilinx-xadc-core.c
@@ -586,14 +586,18 @@ static int xadc_update_scan_mode(struct iio_dev *indio_dev,
{
struct xadc *xadc = iio_priv(indio_dev);
unsigned int n;
+ void *data;
n = bitmap_weight(mask, indio_dev->masklength);
- kfree(xadc->data);
- xadc->data = kcalloc(n, sizeof(*xadc->data), GFP_KERNEL);
- if (!xadc->data)
+ data = devm_krealloc_array(indio_dev->dev.parent, xadc->data, n,
+ sizeof(*xadc->data), GFP_KERNEL);
+ if (!data)
return -ENOMEM;
+ memset(data, 0, n * sizeof(*xadc->data));
+ xadc->data = data;
+
return 0;
}
@@ -1372,7 +1376,6 @@ static int xadc_remove(struct platform_device *pdev)
free_irq(xadc->irq, indio_dev);
cancel_delayed_work_sync(&xadc->zynq_unmask_work);
clk_disable_unprepare(xadc->clk);
- kfree(xadc->data);
return 0;
}
--
2.29.1
next prev parent reply other threads:[~2020-11-02 14:26 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-02 14:22 [PATCH v2 0/4] iio: adc: xilinx: use even more devres Bartosz Golaszewski
2020-11-02 14:22 ` [PATCH v2 1/4] device: provide devm_krealloc_array() Bartosz Golaszewski
2020-11-14 15:46 ` Jonathan Cameron
2020-11-14 16:17 ` Greg KH
2020-11-16 10:18 ` Bartosz Golaszewski
2020-11-23 11:38 ` Bartosz Golaszewski
2020-11-28 16:00 ` Jonathan Cameron
2020-11-02 14:22 ` [PATCH v2 2/4] iio: adc: xilinx: use helper variable for &pdev->dev Bartosz Golaszewski
2020-11-02 14:22 ` Bartosz Golaszewski [this message]
2020-11-02 14:22 ` [PATCH v2 4/4] iio: adc: xilinx: use more devres helpers and remove remove() Bartosz Golaszewski
2020-11-08 17:08 ` Jonathan Cameron
2020-11-09 10:52 ` Bartosz Golaszewski
2020-11-08 17:08 ` [PATCH v2 0/4] iio: adc: xilinx: use even more devres Jonathan Cameron
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201102142228.14949-4-brgl@bgdev.pl \
--to=brgl@bgdev.pl \
--cc=bgolaszewski@baylibre.com \
--cc=jic23@kernel.org \
--cc=lars@metafoo.de \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-iio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=michal.simek@xilinx.com \
--cc=pmeerw@pmeerw.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).