mirrors/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-01-23 08:35:19 -05:00
Code Activity

spi: bcmbca-hsspi: Use devm_spi_alloc_host()

Browse source 
Use devm_spi_alloc_host() so that there's no need to call
spi_controller_put() in the error path.

Signed-off-by: Jinjie Ruan <ruanjinjie@huawei.com>
Reviewed-by: William Zhang <william.zhang@broadcom.com>
Link: https://patch.msgid.link/20240826124903.3429235-3-ruanjinjie@huawei.com
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Jinjie Ruan 2024-08-26 20:49:03 +08:00 • committed by Mark Brown
parent 4439a2e92c
commit deb269e039
No known key found for this signature in database
GPG key ID: 24D68B725D5487D0
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
drivers/spi/spi-bcmbca-hsspi.c
View file

@ -480,7 +480,7 @@ static int bcmbca_hsspi_probe(struct platform_device *pdev)
} }
} }
host = spi_alloc_host(&pdev->dev, sizeof(*bs)); host = devm_spi_alloc_host(&pdev->dev, sizeof(*bs));
if (!host) { if (!host) {
ret = -ENOMEM; ret = -ENOMEM;
goto out_disable_pll_clk; goto out_disable_pll_clk;
@ -536,17 +536,17 @@ static int bcmbca_hsspi_probe(struct platform_device *pdev)
ret = devm_request_irq(dev, irq, bcmbca_hsspi_interrupt, IRQF_SHARED, ret = devm_request_irq(dev, irq, bcmbca_hsspi_interrupt, IRQF_SHARED,
pdev->name, bs); pdev->name, bs);
if (ret) if (ret)
goto out_put_host; goto out_disable_pll_clk;
} }
ret = devm_pm_runtime_enable(&pdev->dev); ret = devm_pm_runtime_enable(&pdev->dev);
if (ret) if (ret)
goto out_put_host; goto out_disable_pll_clk;
ret = sysfs_create_group(&pdev->dev.kobj, &bcmbca_hsspi_group); ret = sysfs_create_group(&pdev->dev.kobj, &bcmbca_hsspi_group);
if (ret) { if (ret) {
dev_err(&pdev->dev, "couldn't register sysfs group\n"); dev_err(&pdev->dev, "couldn't register sysfs group\n");
goto out_put_host; goto out_disable_pll_clk;
} }
/* register and we are done */ /* register and we are done */
@ -560,8 +560,6 @@ static int bcmbca_hsspi_probe(struct platform_device *pdev)
out_sysgroup_disable: out_sysgroup_disable:
sysfs_remove_group(&pdev->dev.kobj, &bcmbca_hsspi_group); sysfs_remove_group(&pdev->dev.kobj, &bcmbca_hsspi_group);
out_put_host:
spi_controller_put(host);
out_disable_pll_clk: out_disable_pll_clk:
clk_disable_unprepare(pll_clk); clk_disable_unprepare(pll_clk);
out_disable_clk: out_disable_clk: