mirrors/linux
2
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-07-22 17:27:37 -04:00
Code Issues Packages Projects Releases Wiki Activity

spi: meson-spifc: switch to managed controller allocation

Browse Source 
Switch to device managed controller allocation for consistency and to
simplify error handling.

Signed-off-by: Johan Hovold <johan@kernel.org>
Link: https://patch.msgid.link/20260511150408.796155-11-johan@kernel.org
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Johan Hovold
2026-05-11 17:04:06 +02:00
committed by Mark Brown
parent 4fee1d3a56
commit 1e447a5aa1
1 changed files with 8 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
drivers/spi/spi-meson-spifc.c
View File

@@ -288,9 +288,9 @@ static int meson_spifc_probe(struct platform_device *pdev)
struct meson_spifc *spifc;
void __iomem *base;
unsigned int rate;
int ret = 0;
int ret;
host = spi_alloc_host(&pdev->dev, sizeof(struct meson_spifc));
host = devm_spi_alloc_host(&pdev->dev, sizeof(struct meson_spifc));
if (!host)
return -ENOMEM;
@@ -300,23 +300,18 @@ static int meson_spifc_probe(struct platform_device *pdev)
spifc->dev = &pdev->dev;
base = devm_platform_ioremap_resource(pdev, 0);
if (IS_ERR(base)) {
ret = PTR_ERR(base);
goto out_err;
}
if (IS_ERR(base))
return PTR_ERR(base);
spifc->regmap = devm_regmap_init_mmio(spifc->dev, base,
&spifc_regmap_config);
if (IS_ERR(spifc->regmap)) {
ret = PTR_ERR(spifc->regmap);
goto out_err;
}
if (IS_ERR(spifc->regmap))
return PTR_ERR(spifc->regmap);
spifc->clk = devm_clk_get_enabled(spifc->dev, NULL);
if (IS_ERR(spifc->clk)) {
dev_err(spifc->dev, "missing clock\n");
ret = PTR_ERR(spifc->clk);
goto out_err;
return PTR_ERR(spifc->clk);
}
rate = clk_get_rate(spifc->clk);
@@ -342,8 +337,7 @@ static int meson_spifc_probe(struct platform_device *pdev)
return 0;
out_pm:
pm_runtime_disable(spifc->dev);
out_err:
spi_controller_put(host);
return ret;
}