Replace the hand-rolled devm wrapper (k3_mem_release + devm_add_action_or_reset) with the standard devm_of_reserved_mem_device_init(), letting the device resource manager handle cleanup automatically. Remove the now-unused k3_mem_release exported symbol.
Signed-off-by: Mukesh Ojha <[email protected]> --- drivers/remoteproc/ti_k3_common.c | 13 +------------ drivers/remoteproc/ti_k3_common.h | 1 - 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/drivers/remoteproc/ti_k3_common.c b/drivers/remoteproc/ti_k3_common.c index 3cb8ae5d72f6..f08b9e373220 100644 --- a/drivers/remoteproc/ti_k3_common.c +++ b/drivers/remoteproc/ti_k3_common.c @@ -458,14 +458,6 @@ int k3_rproc_of_get_memories(struct platform_device *pdev, } EXPORT_SYMBOL_GPL(k3_rproc_of_get_memories); -void k3_mem_release(void *data) -{ - struct device *dev = data; - - of_reserved_mem_device_release(dev); -} -EXPORT_SYMBOL_GPL(k3_mem_release); - int k3_reserved_mem_init(struct k3_rproc *kproc) { struct device *dev = kproc->dev; @@ -486,14 +478,11 @@ int k3_reserved_mem_init(struct k3_rproc *kproc) } /* use reserved memory region 0 for vring DMA allocations */ - ret = of_reserved_mem_device_init_by_idx(dev, np, 0); + ret = devm_of_reserved_mem_device_init(dev); if (ret) { dev_err(dev, "device cannot initialize DMA pool (%d)\n", ret); return ret; } - ret = devm_add_action_or_reset(dev, k3_mem_release, dev); - if (ret) - return ret; num_rmems--; kproc->rmem = devm_kcalloc(dev, num_rmems, sizeof(*kproc->rmem), GFP_KERNEL); diff --git a/drivers/remoteproc/ti_k3_common.h b/drivers/remoteproc/ti_k3_common.h index aee3c28dbe51..9a58aeb3867c 100644 --- a/drivers/remoteproc/ti_k3_common.h +++ b/drivers/remoteproc/ti_k3_common.h @@ -112,7 +112,6 @@ void *k3_rproc_da_to_va(struct rproc *rproc, u64 da, size_t len, bool *is_iomem); int k3_rproc_of_get_memories(struct platform_device *pdev, struct k3_rproc *kproc); -void k3_mem_release(void *data); int k3_reserved_mem_init(struct k3_rproc *kproc); void k3_release_tsp(void *data); #endif /* REMOTEPROC_TI_K3_COMMON_H */ -- 2.53.0
