Commit 209dd85a authored by Andrew Davis's avatar Andrew Davis Committed by Mathieu Poirier

remoteproc: keystone: Use devm_rproc_alloc() helper

Use the device lifecycle managed allocation function. This helps prevent
mistakes like freeing out of order in cleanup functions and forgetting to
free on error paths.
Signed-off-by: default avatarAndrew Davis <afd@ti.com>
Link: https://lore.kernel.org/r/20240802182300.244055-2-afd@ti.comSigned-off-by: default avatarMathieu Poirier <mathieu.poirier@linaro.org>
parent d32e7166
...@@ -384,8 +384,8 @@ static int keystone_rproc_probe(struct platform_device *pdev) ...@@ -384,8 +384,8 @@ static int keystone_rproc_probe(struct platform_device *pdev)
if (!fw_name) if (!fw_name)
return -ENOMEM; return -ENOMEM;
rproc = rproc_alloc(dev, dev_name(dev), &keystone_rproc_ops, fw_name, rproc = devm_rproc_alloc(dev, dev_name(dev), &keystone_rproc_ops,
sizeof(*ksproc)); fw_name, sizeof(*ksproc));
if (!rproc) if (!rproc)
return -ENOMEM; return -ENOMEM;
...@@ -396,13 +396,11 @@ static int keystone_rproc_probe(struct platform_device *pdev) ...@@ -396,13 +396,11 @@ static int keystone_rproc_probe(struct platform_device *pdev)
ret = keystone_rproc_of_get_dev_syscon(pdev, ksproc); ret = keystone_rproc_of_get_dev_syscon(pdev, ksproc);
if (ret) if (ret)
goto free_rproc; return ret;
ksproc->reset = devm_reset_control_get_exclusive(dev, NULL); ksproc->reset = devm_reset_control_get_exclusive(dev, NULL);
if (IS_ERR(ksproc->reset)) { if (IS_ERR(ksproc->reset))
ret = PTR_ERR(ksproc->reset); return PTR_ERR(ksproc->reset);
goto free_rproc;
}
/* enable clock for accessing DSP internal memories */ /* enable clock for accessing DSP internal memories */
pm_runtime_enable(dev); pm_runtime_enable(dev);
...@@ -467,8 +465,6 @@ static int keystone_rproc_probe(struct platform_device *pdev) ...@@ -467,8 +465,6 @@ static int keystone_rproc_probe(struct platform_device *pdev)
pm_runtime_put_sync(dev); pm_runtime_put_sync(dev);
disable_rpm: disable_rpm:
pm_runtime_disable(dev); pm_runtime_disable(dev);
free_rproc:
rproc_free(rproc);
return ret; return ret;
} }
...@@ -480,7 +476,6 @@ static void keystone_rproc_remove(struct platform_device *pdev) ...@@ -480,7 +476,6 @@ static void keystone_rproc_remove(struct platform_device *pdev)
gpiod_put(ksproc->kick_gpio); gpiod_put(ksproc->kick_gpio);
pm_runtime_put_sync(&pdev->dev); pm_runtime_put_sync(&pdev->dev);
pm_runtime_disable(&pdev->dev); pm_runtime_disable(&pdev->dev);
rproc_free(ksproc->rproc);
of_reserved_mem_device_release(&pdev->dev); of_reserved_mem_device_release(&pdev->dev);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment