Replace the hand-rolled devm wrapper (mt8183_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/mt8183/mt8183-afe-pcm.c | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/sound/soc/mediatek/mt8183/mt8183-afe-pcm.c 
b/sound/soc/mediatek/mt8183/mt8183-afe-pcm.c
index 2634699534db..6ad396e3b10d 100644
--- a/sound/soc/mediatek/mt8183/mt8183-afe-pcm.c
+++ b/sound/soc/mediatek/mt8183/mt8183-afe-pcm.c
@@ -766,11 +766,6 @@ static const dai_register_cb dai_register_cbs[] = {
        mt8183_dai_memif_register,
 };
 
-static void mt8183_afe_release_reserved_mem(void *data)
-{
-       of_reserved_mem_device_release(data);
-}
-
 static int mt8183_afe_pcm_dev_probe(struct platform_device *pdev)
 {
        struct mtk_base_afe *afe;
@@ -795,16 +790,10 @@ static int mt8183_afe_pcm_dev_probe(struct 
platform_device *pdev)
        afe_priv = afe->platform_priv;
        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,
-                                              mt8183_afe_release_reserved_mem,
-                                              dev);
-               if (ret)
-                       return ret;
        }
 
        /* initial audio related clock */
-- 
2.53.0


Reply via email to