iio: buffer-dmaengine: simplify __devm_iio_dmaengine_buffer_free()
Use devm_add_action_or_reset() instead of devres_alloc() and devres_add(), which works the same. This will simplify the code. There is no functional changes. Signed-off-by: Yicong Yang <yangyicong@hisilicon.com> Reviewed-by: Lars-Peter Clausen <lars@metafoo.de> Reviewed-by: Nuno Sa <nuno.sa@analog.com> Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com> Link: https://lore.kernel.org/r/1617881896-3164-3-git-send-email-yangyicong@hisilicon.com Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
This commit is contained in:
parent
4e023c4dcf
commit
2c6a958789
@ -228,9 +228,9 @@ static void iio_dmaengine_buffer_free(struct iio_buffer *buffer)
|
||||
iio_buffer_put(buffer);
|
||||
}
|
||||
|
||||
static void __devm_iio_dmaengine_buffer_free(struct device *dev, void *res)
|
||||
static void __devm_iio_dmaengine_buffer_free(void *buffer)
|
||||
{
|
||||
iio_dmaengine_buffer_free(*(struct iio_buffer **)res);
|
||||
iio_dmaengine_buffer_free(buffer);
|
||||
}
|
||||
|
||||
/**
|
||||
@ -247,21 +247,17 @@ static void __devm_iio_dmaengine_buffer_free(struct device *dev, void *res)
|
||||
static struct iio_buffer *devm_iio_dmaengine_buffer_alloc(struct device *dev,
|
||||
const char *channel)
|
||||
{
|
||||
struct iio_buffer **bufferp, *buffer;
|
||||
|
||||
bufferp = devres_alloc(__devm_iio_dmaengine_buffer_free,
|
||||
sizeof(*bufferp), GFP_KERNEL);
|
||||
if (!bufferp)
|
||||
return ERR_PTR(-ENOMEM);
|
||||
struct iio_buffer *buffer;
|
||||
int ret;
|
||||
|
||||
buffer = iio_dmaengine_buffer_alloc(dev, channel);
|
||||
if (IS_ERR(buffer)) {
|
||||
devres_free(bufferp);
|
||||
if (IS_ERR(buffer))
|
||||
return buffer;
|
||||
}
|
||||
|
||||
*bufferp = buffer;
|
||||
devres_add(dev, bufferp);
|
||||
ret = devm_add_action_or_reset(dev, __devm_iio_dmaengine_buffer_free,
|
||||
buffer);
|
||||
if (ret)
|
||||
return ERR_PTR(ret);
|
||||
|
||||
return buffer;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user