github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-29 09:33:31 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

remoteproc: keystone: Use devm action to call PM runtime put sync

Browse Source 
This helps prevent mistakes like putting out of order in cleanup functions
and forgetting to put sync on error paths.

Signed-off-by: Andrew Davis <afd@ti.com>
Link: https://lore.kernel.org/r/20250814140835.651652-3-afd@ti.com
Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
This commit is contained in:
Andrew Davis 2025-08-14 09:08:33 -05:00 committed by Mathieu Poirier
parent db0427a8a5
commit a2ab9cd283
1 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
drivers/remoteproc/keystone_remoteproc.c
View File

@ -356,6 +356,13 @@ static void keystone_rproc_mem_release(void *data)
of_reserved_mem_device_release(dev);
}
static void keystone_rproc_pm_runtime_put(void *data)
{
struct device *dev = data;
pm_runtime_put_sync(dev);
}
static int keystone_rproc_probe(struct platform_device *pdev)
{
struct device *dev = &pdev->dev;
@ -409,29 +416,26 @@ static int keystone_rproc_probe(struct platform_device *pdev)
if (ret < 0)
return dev_err_probe(dev, ret, "failed to enable clock\n");
ret = devm_add_action_or_reset(dev, keystone_rproc_pm_runtime_put, dev);
if (ret)
return dev_err_probe(dev, ret, "failed to add disable pm devm action\n");
ret = keystone_rproc_of_get_memories(pdev, ksproc);
if (ret)
goto disable_clk;
return ret;
ksproc->irq_ring = platform_get_irq_byname(pdev, "vring");
if (ksproc->irq_ring < 0) {
ret = ksproc->irq_ring;
goto disable_clk;
}
if (ksproc->irq_ring < 0)
return ksproc->irq_ring;
ksproc->irq_fault = platform_get_irq_byname(pdev, "exception");
if (ksproc->irq_fault < 0) {
ret = ksproc->irq_fault;
goto disable_clk;
}
if (ksproc->irq_fault < 0)
return ksproc->irq_fault;
ksproc->kick_gpio = gpiod_get(dev, "kick", GPIOD_ASIS);
ret = PTR_ERR_OR_ZERO(ksproc->kick_gpio);
if (ret) {
dev_err(dev, "failed to get gpio for virtio kicks, status = %d\n",
ret);
goto disable_clk;
}
if (ret)
return dev_err_probe(dev, ret, "failed to get gpio for virtio kicks\n");
ret = of_reserved_mem_device_init(dev);
if (ret) {
@ -439,7 +443,7 @@ static int keystone_rproc_probe(struct platform_device *pdev)
} else {
ret = devm_add_action_or_reset(dev, keystone_rproc_mem_release, dev);
if (ret)
goto disable_clk;
return ret;
}
/* ensure the DSP is in reset before loading firmware */
@ -465,8 +469,6 @@ static int keystone_rproc_probe(struct platform_device *pdev)
release_mem:
gpiod_put(ksproc->kick_gpio);
disable_clk:
pm_runtime_put_sync(dev);
return ret;
}
@ -476,7 +478,6 @@ static void keystone_rproc_remove(struct platform_device *pdev)
rproc_del(ksproc->rproc);
gpiod_put(ksproc->kick_gpio);
pm_runtime_put_sync(&pdev->dev);
}
static const struct of_device_id keystone_rproc_of_match[] = {