diff options
| author | Mark Brown <broonie@kernel.org> | 2024-08-29 18:39:05 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2024-08-29 18:39:05 +0100 |
| commit | 11543f534adf7436239da26e5efa495adb47615d (patch) | |
| tree | 2fb4e5347822d9aaeb8c13acb8c44cab4fdccc62 /drivers/spi | |
| parent | 1db86650b978bf4bf70267556f6bf7bc8b2253da (diff) | |
| parent | deb269e0394f2c75e1735132e29fa2f5181e107a (diff) | |
| download | lwn-11543f534adf7436239da26e5efa495adb47615d.tar.gz lwn-11543f534adf7436239da26e5efa495adb47615d.zip | |
spi: bcmbca-hsspi: Fix missing pm_runtime_disable()
Merge series from Jinjie Ruan <ruanjinjie@huawei.com>:
Fix missing pm_runtime_disable().
Diffstat (limited to 'drivers/spi')
| -rw-r--r-- | drivers/spi/spi-bcmbca-hsspi.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/drivers/spi/spi-bcmbca-hsspi.c b/drivers/spi/spi-bcmbca-hsspi.c index e48a56c68ce7..d936104a41ec 100644 --- a/drivers/spi/spi-bcmbca-hsspi.c +++ b/drivers/spi/spi-bcmbca-hsspi.c @@ -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) { ret = -ENOMEM; goto out_disable_pll_clk; @@ -536,15 +536,17 @@ static int bcmbca_hsspi_probe(struct platform_device *pdev) ret = devm_request_irq(dev, irq, bcmbca_hsspi_interrupt, IRQF_SHARED, pdev->name, bs); if (ret) - goto out_put_host; + goto out_disable_pll_clk; } - pm_runtime_enable(&pdev->dev); + ret = devm_pm_runtime_enable(&pdev->dev); + if (ret) + goto out_disable_pll_clk; ret = sysfs_create_group(&pdev->dev.kobj, &bcmbca_hsspi_group); if (ret) { dev_err(&pdev->dev, "couldn't register sysfs group\n"); - goto out_pm_disable; + goto out_disable_pll_clk; } /* register and we are done */ @@ -558,10 +560,6 @@ static int bcmbca_hsspi_probe(struct platform_device *pdev) out_sysgroup_disable: sysfs_remove_group(&pdev->dev.kobj, &bcmbca_hsspi_group); -out_pm_disable: - pm_runtime_disable(&pdev->dev); -out_put_host: - spi_controller_put(host); out_disable_pll_clk: clk_disable_unprepare(pll_clk); out_disable_clk: |