[PATCH 2/5] iio: adc: xilinx: use devm_krealloc() instead of kfree() + kcalloc()
From: Bartosz Golaszewski
Date: Mon Oct 26 2020 - 09:36:34 EST
From: Bartosz Golaszewski <bgolaszewski@xxxxxxxxxxxx>
We now have devm_krealloc() in the kernel Use it indstead of calling
kfree() and kcalloc() separately.
Signed-off-by: Bartosz Golaszewski <bgolaszewski@xxxxxxxxxxxx>
---
drivers/iio/adc/xilinx-xadc-core.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/iio/adc/xilinx-xadc-core.c b/drivers/iio/adc/xilinx-xadc-core.c
index 8494eb424b33..b516280ccbd4 100644
--- a/drivers/iio/adc/xilinx-xadc-core.c
+++ b/drivers/iio/adc/xilinx-xadc-core.c
@@ -589,8 +589,9 @@ static int xadc_update_scan_mode(struct iio_dev *indio_dev,
n = bitmap_weight(mask, indio_dev->masklength);
- kfree(xadc->data);
- xadc->data = kcalloc(n, sizeof(*xadc->data), GFP_KERNEL);
+ xadc->data = devm_krealloc(indio_dev->dev.parent, xadc->data,
+ n * sizeof(*xadc->data),
+ GFP_KERNEL | __GFP_ZERO);
if (!xadc->data)
return -ENOMEM;
@@ -1372,7 +1373,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