[PATCH 21/42] media: arm: mali-c55: Use devm_of_reserved_mem_device_init()
Mukesh Ojha <[email protected]>
| Newsgroups | org.kernel.vger.linux-mmc,dev.linux.lists.imx,dev.linux.lists.linux-staging,dev.linux.lists.linux-sunxi,org.freedesktop.lists.dri-devel,org.infradead.lists.linux-mediatek,org.kernel.vger.linux-arm-msm,org.kernel.vger.linux-devicetree,org.kernel.vger.linux-kernel,org.kernel.vger.linux-media,org.kernel.vger.linux-mips,org.kernel.vger.linux-remoteproc,org.kernel.vger.linux-sound,org.kernel.vger.linux-tegra,org.ozlabs.lists.linux-aspeed,org.ozlabs.lists.linuxppc-dev,org.ozlabs.lists.openbmc |
|---|---|
| Message-ID | <[email protected]> |
Use the devres-managed devm_of_reserved_mem_device_init() instead of the manual of_reserved_mem_device_init()/of_reserved_mem_device_release() pair, letting the device resource manager handle cleanup automatically. Signed-off-by: Mukesh Ojha <[email protected]> --- drivers/media/platform/arm/mali-c55/mali-c55-core.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/drivers/media/platform/arm/mali-c55/mali-c55-core.c b/drivers/media/platform/arm/mali-c55/mali-c55-core.c index 94a389b3f833..afbec11f69f8 100644 --- a/drivers/media/platform/arm/mali-c55/mali-c55-core.c +++ b/drivers/media/platform/arm/mali-c55/mali-c55-core.c @@ -801,14 +801,12 @@ static int mali_c55_probe(struct platform_device *pdev) if (ret) return dev_err_probe(dev, ret, "failed to acquire resets\n"); - of_reserved_mem_device_init(dev); + devm_of_reserved_mem_device_init(dev); vb2_dma_contig_set_max_seg_size(dev, UINT_MAX); ret = __mali_c55_power_on(mali_c55); - if (ret) { - dev_err_probe(dev, ret, "failed to power on\n"); - goto err_release_mem; - } + if (ret) + return dev_err_probe(dev, ret, "failed to power on\n"); ret = mali_c55_check_hwcfg(mali_c55); if (ret) @@ -847,9 +845,6 @@ static int mali_c55_probe(struct platform_device *pdev) kfree(mali_c55->context.registers); err_power_off: __mali_c55_power_off(mali_c55); -err_release_mem: - of_reserved_mem_device_release(dev); - return ret; } @@ -864,7 +859,6 @@ static void mali_c55_remove(struct platform_device *pdev) } pm_runtime_disable(&pdev->dev); kfree(mali_c55->context.registers); - of_reserved_mem_device_release(&pdev->dev); } static const struct of_device_id mali_c55_of_match[] = { -- 2.53.0