iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

iio: buffer-dmaengine: simplify __devm_iio_dmaengine_buffer_free()

Browse Source 
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:
Yicong Yang 2021-04-08 19:38:11 +08:00 committed by Jonathan Cameron
parent 4e023c4dcf
commit 2c6a958789
1 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
drivers/iio/buffer/industrialio-buffer-dmaengine.c
View File

@ -228,9 +228,9 @@ static void iio_dmaengine_buffer_free(struct iio_buffer *buffer)
iio_buffer_put(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, static struct iio_buffer *devm_iio_dmaengine_buffer_alloc(struct device *dev,
const char *channel) const char *channel)
{ {
struct iio_buffer **bufferp, *buffer; struct iio_buffer *buffer;
int ret;
bufferp = devres_alloc(__devm_iio_dmaengine_buffer_free,
sizeof(*bufferp), GFP_KERNEL);
if (!bufferp)
return ERR_PTR(-ENOMEM);
buffer = iio_dmaengine_buffer_alloc(dev, channel); buffer = iio_dmaengine_buffer_alloc(dev, channel);
if (IS_ERR(buffer)) { if (IS_ERR(buffer))
devres_free(bufferp);
return buffer; return buffer;
}
*bufferp = buffer; ret = devm_add_action_or_reset(dev, __devm_iio_dmaengine_buffer_free,
devres_add(dev, bufferp); buffer);
if (ret)
return ERR_PTR(ret);
return buffer; return buffer;
} }