Commit 6ff0199a authored by Alexandru Ardelean's avatar Alexandru Ardelean Committed by Jonathan Cameron

iio: adc: ti_am335x_adc: alloc channels via devm_kcalloc()

This change attaches the life-cycle of the channels array to the parent
device object that is attached to the IIO device.
This way we can remove from the cleanup code, the explicit
tiadc_channels_remove() which simply does a kfree() on the channels array.
Signed-off-by: default avatarAlexandru Ardelean <alexandru.ardelean@analog.com>
Signed-off-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
parent a07a4fe5
...@@ -428,7 +428,8 @@ static const char * const chan_name_ain[] = { ...@@ -428,7 +428,8 @@ static const char * const chan_name_ain[] = {
"AIN7", "AIN7",
}; };
static int tiadc_channel_init(struct iio_dev *indio_dev, int channels) static int tiadc_channel_init(struct device *dev, struct iio_dev *indio_dev,
int channels)
{ {
struct tiadc_device *adc_dev = iio_priv(indio_dev); struct tiadc_device *adc_dev = iio_priv(indio_dev);
struct iio_chan_spec *chan_array; struct iio_chan_spec *chan_array;
...@@ -436,7 +437,8 @@ static int tiadc_channel_init(struct iio_dev *indio_dev, int channels) ...@@ -436,7 +437,8 @@ static int tiadc_channel_init(struct iio_dev *indio_dev, int channels)
int i; int i;
indio_dev->num_channels = channels; indio_dev->num_channels = channels;
chan_array = kcalloc(channels, sizeof(*chan_array), GFP_KERNEL); chan_array = devm_kcalloc(dev, channels, sizeof(*chan_array),
GFP_KERNEL);
if (chan_array == NULL) if (chan_array == NULL)
return -ENOMEM; return -ENOMEM;
...@@ -459,11 +461,6 @@ static int tiadc_channel_init(struct iio_dev *indio_dev, int channels) ...@@ -459,11 +461,6 @@ static int tiadc_channel_init(struct iio_dev *indio_dev, int channels)
return 0; return 0;
} }
static void tiadc_channels_remove(struct iio_dev *indio_dev)
{
kfree(indio_dev->channels);
}
static int tiadc_read_raw(struct iio_dev *indio_dev, static int tiadc_read_raw(struct iio_dev *indio_dev,
struct iio_chan_spec const *chan, struct iio_chan_spec const *chan,
int *val, int *val2, long mask) int *val, int *val2, long mask)
...@@ -634,7 +631,7 @@ static int tiadc_probe(struct platform_device *pdev) ...@@ -634,7 +631,7 @@ static int tiadc_probe(struct platform_device *pdev)
tiadc_writel(adc_dev, REG_FIFO1THR, FIFO1_THRESHOLD); tiadc_writel(adc_dev, REG_FIFO1THR, FIFO1_THRESHOLD);
mutex_init(&adc_dev->fifo1_lock); mutex_init(&adc_dev->fifo1_lock);
err = tiadc_channel_init(indio_dev, adc_dev->channels); err = tiadc_channel_init(&pdev->dev, indio_dev, adc_dev->channels);
if (err < 0) if (err < 0)
return err; return err;
...@@ -665,7 +662,6 @@ static int tiadc_probe(struct platform_device *pdev) ...@@ -665,7 +662,6 @@ static int tiadc_probe(struct platform_device *pdev)
err_buffer_unregister: err_buffer_unregister:
tiadc_iio_buffered_hardware_remove(indio_dev); tiadc_iio_buffered_hardware_remove(indio_dev);
err_free_channels: err_free_channels:
tiadc_channels_remove(indio_dev);
return err; return err;
} }
...@@ -683,7 +679,6 @@ static int tiadc_remove(struct platform_device *pdev) ...@@ -683,7 +679,6 @@ static int tiadc_remove(struct platform_device *pdev)
} }
iio_device_unregister(indio_dev); iio_device_unregister(indio_dev);
tiadc_iio_buffered_hardware_remove(indio_dev); tiadc_iio_buffered_hardware_remove(indio_dev);
tiadc_channels_remove(indio_dev);
step_en = get_adc_step_mask(adc_dev); step_en = get_adc_step_mask(adc_dev);
am335x_tsc_se_clr(adc_dev->mfd_tscadc, step_en); am335x_tsc_se_clr(adc_dev->mfd_tscadc, step_en);
......
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