Replace the hand-rolled devm wrapper (mt8192_afe_release_reserved_mem +
devm_add_action_or_reset) with the standard
devm_of_reserved_mem_device_init(), letting the device resource manager
handle cleanup automatically.

Signed-off-by: Mukesh Ojha <[email protected]>
---
 sound/soc/mediatek/mt8192/mt8192-afe-pcm.c | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/sound/soc/mediatek/mt8192/mt8192-afe-pcm.c 
b/sound/soc/mediatek/mt8192/mt8192-afe-pcm.c
index db0ae44a86af..e4ecd23df180 100644
--- a/sound/soc/mediatek/mt8192/mt8192-afe-pcm.c
+++ b/sound/soc/mediatek/mt8192/mt8192-afe-pcm.c
@@ -2155,11 +2155,6 @@ static const dai_register_cb dai_register_cbs[] = {
        mt8192_dai_memif_register,
 };
 
-static void mt8192_afe_release_reserved_mem(void *data)
-{
-       of_reserved_mem_device_release(data);
-}
-
 static int mt8192_afe_pcm_dev_probe(struct platform_device *pdev)
 {
        struct mtk_base_afe *afe;
@@ -2185,14 +2180,10 @@ static int mt8192_afe_pcm_dev_probe(struct 
platform_device *pdev)
 
        afe->dev = dev;
 
-       ret = of_reserved_mem_device_init(dev);
+       ret = devm_of_reserved_mem_device_init(dev);
        if (ret) {
                dev_info(dev, "no reserved memory found, pre-allocating buffers 
instead\n");
                afe->preallocate_buffers = true;
-       } else {
-               ret = devm_add_action_or_reset(dev, 
mt8192_afe_release_reserved_mem, dev);
-               if (ret)
-                       return ret;
        }
 
        /* init audio related clock */
-- 
2.53.0


Reply via email to