Commit 6b3aa313 authored by Axel Lin's avatar Axel Lin Committed by Jonathan Cameron

Revert "iio: at91_adc: Use devm_kcalloc to allocate arrays"

This reverts commit 45259859.
This fixes build error because devm_kcalloc does not exist in current tree.
Signed-off-by: default avatarAxel Lin <axel.lin@ingics.com>
Signed-off-by: default avatarJonathan Cameron <jic23@kernel.org>
parent 2b0c856a
...@@ -123,8 +123,10 @@ static int at91_adc_channel_init(struct iio_dev *idev) ...@@ -123,8 +123,10 @@ static int at91_adc_channel_init(struct iio_dev *idev)
idev->num_channels = bitmap_weight(&st->channels_mask, idev->num_channels = bitmap_weight(&st->channels_mask,
st->num_channels) + 1; st->num_channels) + 1;
chan_array = devm_kcalloc(&idev->dev, idev->num_channels + 1, chan_array = devm_kzalloc(&idev->dev,
sizeof(*chan_array), GFP_KERNEL); ((idev->num_channels + 1) *
sizeof(struct iio_chan_spec)),
GFP_KERNEL);
if (!chan_array) if (!chan_array)
return -ENOMEM; return -ENOMEM;
...@@ -268,8 +270,9 @@ static int at91_adc_trigger_init(struct iio_dev *idev) ...@@ -268,8 +270,9 @@ static int at91_adc_trigger_init(struct iio_dev *idev)
struct at91_adc_state *st = iio_priv(idev); struct at91_adc_state *st = iio_priv(idev);
int i, ret; int i, ret;
st->trig = devm_kcalloc(&idev->dev, st->trigger_number, st->trig = devm_kzalloc(&idev->dev,
sizeof(*st->trig), GFP_KERNEL); st->trigger_number * sizeof(st->trig),
GFP_KERNEL);
if (st->trig == NULL) { if (st->trig == NULL) {
ret = -ENOMEM; ret = -ENOMEM;
...@@ -451,8 +454,9 @@ static int at91_adc_probe_dt(struct at91_adc_state *st, ...@@ -451,8 +454,9 @@ static int at91_adc_probe_dt(struct at91_adc_state *st,
st->registers->trigger_register = prop; st->registers->trigger_register = prop;
st->trigger_number = of_get_child_count(node); st->trigger_number = of_get_child_count(node);
st->trigger_list = devm_kcalloc(&idev->dev, st->trigger_number, st->trigger_list = devm_kzalloc(&idev->dev, st->trigger_number *
sizeof(*st->trigger_list), GFP_KERNEL); sizeof(struct at91_adc_trigger),
GFP_KERNEL);
if (!st->trigger_list) { if (!st->trigger_list) {
dev_err(&idev->dev, "Could not allocate trigger list memory.\n"); dev_err(&idev->dev, "Could not allocate trigger list memory.\n");
ret = -ENOMEM; ret = -ENOMEM;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment