github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-07-27 17:47:41 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

spi: sprd: switch to managed controller allocation

Browse Source 
Switch to device managed controller allocation to simplify error
handling and to avoid having to take another reference during
deregistration.

Signed-off-by: Johan Hovold <johan@kernel.org>
Link: https://patch.msgid.link/20260505072909.618363-11-johan@kernel.org
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Johan Hovold 2026-05-05 09:28:59 +02:00 committed by Mark Brown
parent cd1cd2ff56
commit d68627cc76
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
1 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/spi/spi-sprd.c
View File

@ -923,16 +923,14 @@ static int sprd_spi_probe(struct platform_device *pdev)
int ret;
pdev->id = of_alias_get_id(pdev->dev.of_node, "spi");
sctlr = spi_alloc_host(&pdev->dev, sizeof(*ss));
sctlr = devm_spi_alloc_host(&pdev->dev, sizeof(*ss));
if (!sctlr)
return -ENOMEM;
ss = spi_controller_get_devdata(sctlr);
ss->base = devm_platform_get_and_ioremap_resource(pdev, 0, &res);
if (IS_ERR(ss->base)) {
ret = PTR_ERR(ss->base);
goto free_controller;
}
if (IS_ERR(ss->base))
return PTR_ERR(ss->base);
ss->phy_base = res->start;
ss->dev = &pdev->dev;
@ -949,15 +947,15 @@ static int sprd_spi_probe(struct platform_device *pdev)
platform_set_drvdata(pdev, sctlr);
ret = sprd_spi_clk_init(pdev, ss);
if (ret)
goto free_controller;
return ret;
ret = sprd_spi_irq_init(pdev, ss);
if (ret)
goto free_controller;
return ret;
ret = sprd_spi_dma_init(pdev, ss);
if (ret)
goto free_controller;
return ret;
ret = clk_prepare_enable(ss->clk);
if (ret)
@ -992,8 +990,6 @@ static int sprd_spi_probe(struct platform_device *pdev)
clk_disable_unprepare(ss->clk);
release_dma:
sprd_spi_dma_release(ss);
free_controller:
spi_controller_put(sctlr);
return ret;
}
@ -1008,8 +1004,6 @@ static void sprd_spi_remove(struct platform_device *pdev)
if (ret < 0)
dev_err(ss->dev, "failed to resume SPI controller\n");
spi_controller_get(sctlr);
spi_unregister_controller(sctlr);
if (ret >= 0) {
@ -1019,8 +1013,6 @@ static void sprd_spi_remove(struct platform_device *pdev)
}
pm_runtime_put_noidle(&pdev->dev);
pm_runtime_disable(&pdev->dev);
spi_controller_put(sctlr);
}
static int __maybe_unused sprd_spi_runtime_suspend(struct device *dev)