Gh0st
/
linux
mirror of https://github.com/torvalds/linux.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

spi: spi-nxp-fspi: remove the goto in probe 

Remove all the goto in probe to simplify the driver.

Signed-off-by: Haibo Chen <haibo.chen@nxp.com>
Link: https://patch.msgid.link/20250428-flexspipatch-v3-1-61d5e8f591bc@nxp.com
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Haibo Chen 2025-04-28 18:06:43 +08:00 committed by Mark Brown
parent 92a09c4746
commit 48900813ab
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
1 changed files with 27 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

87
drivers/spi/spi-nxp-fspi.c
View File

@ -1161,10 +1161,10 @@ static int nxp_fspi_probe(struct platform_device *pdev)
struct device_node *np = dev->of_node;
struct resource *res;
struct nxp_fspi *f;
int ret;
int ret, irq;
u32 reg;
ctlr = spi_alloc_host(&pdev->dev, sizeof(*f));
ctlr = devm_spi_alloc_host(&pdev->dev, sizeof(*f));
if (!ctlr)
return -ENOMEM;
@ -1174,10 +1174,8 @@ static int nxp_fspi_probe(struct platform_device *pdev)
f = spi_controller_get_devdata(ctlr);
f->dev = dev;
f->devtype_data = (struct nxp_fspi_devtype_data *)device_get_match_data(dev);
if (!f->devtype_data) {
ret = -ENODEV;
goto err_put_ctrl;
}
if (!f->devtype_data)
return -ENODEV;
platform_set_drvdata(pdev, f);
@ -1186,11 +1184,8 @@ static int nxp_fspi_probe(struct platform_device *pdev)
f->iobase = devm_platform_ioremap_resource(pdev, 0);
else
f->iobase = devm_platform_ioremap_resource_byname(pdev, "fspi_base");
if (IS_ERR(f->iobase)) {
ret = PTR_ERR(f->iobase);
goto err_put_ctrl;
}
if (IS_ERR(f->iobase))
return PTR_ERR(f->iobase);
/* find the resources - controller memory mapped space */
if (is_acpi_node(dev_fwnode(f->dev)))
@ -1198,11 +1193,8 @@ static int nxp_fspi_probe(struct platform_device *pdev)
else
res = platform_get_resource_byname(pdev,
IORESOURCE_MEM, "fspi_mmap");
if (!res) {
ret = -ENODEV;
goto err_put_ctrl;
}
if (!res)
return -ENODEV;
/* assign memory mapped starting address and mapped size. */
f->memmap_phy = res->start;
@ -1211,69 +1203,46 @@ static int nxp_fspi_probe(struct platform_device *pdev)
/* find the clocks */
if (dev_of_node(&pdev->dev)) {
f->clk_en = devm_clk_get(dev, "fspi_en");
if (IS_ERR(f->clk_en)) {
ret = PTR_ERR(f->clk_en);
goto err_put_ctrl;
}
if (IS_ERR(f->clk_en))
return PTR_ERR(f->clk_en);
f->clk = devm_clk_get(dev, "fspi");
if (IS_ERR(f->clk)) {
ret = PTR_ERR(f->clk);
goto err_put_ctrl;
}
ret = nxp_fspi_clk_prep_enable(f);
if (ret) {
dev_err(dev, "can not enable the clock\n");
goto err_put_ctrl;
}
if (IS_ERR(f->clk))
return PTR_ERR(f->clk);
}
/* find the irq */
irq = platform_get_irq(pdev, 0);
if (irq < 0)
return dev_err_probe(dev, irq, "Failed to get irq source");
ret = nxp_fspi_clk_prep_enable(f);
if (ret)
return dev_err_probe(dev, ret, "Can't enable the clock\n");
/* Clear potential interrupts */
reg = fspi_readl(f, f->iobase + FSPI_INTR);
if (reg)
fspi_writel(f, reg, f->iobase + FSPI_INTR);
/* find the irq */
ret = platform_get_irq(pdev, 0);
if (ret < 0)
goto err_disable_clk;
nxp_fspi_default_setup(f);
ret = devm_request_irq(dev, ret,
ret = devm_request_irq(dev, irq,
nxp_fspi_irq_handler, 0, pdev->name, f);
if (ret) {
dev_err(dev, "failed to request irq: %d\n", ret);
goto err_disable_clk;
nxp_fspi_clk_disable_unprep(f);
return dev_err_probe(dev, ret, "Failed to request irq\n");
}
mutex_init(&f->lock);
devm_mutex_init(dev, &f->lock);
ctlr->bus_num = -1;
ctlr->num_chipselect = NXP_FSPI_MAX_CHIPSELECT;
ctlr->mem_ops = &nxp_fspi_mem_ops;
ctlr->mem_caps = &nxp_fspi_mem_caps;
nxp_fspi_default_setup(f);
ctlr->dev.of_node = np;
ret = devm_spi_register_controller(&pdev->dev, ctlr);
if (ret)
goto err_destroy_mutex;
return 0;
err_destroy_mutex:
mutex_destroy(&f->lock);
err_disable_clk:
nxp_fspi_clk_disable_unprep(f);
err_put_ctrl:
spi_controller_put(ctlr);
dev_err(dev, "NXP FSPI probe failed\n");
return ret;
return devm_spi_register_controller(&pdev->dev, ctlr);
}
static void nxp_fspi_remove(struct platform_device *pdev)
@ -1285,8 +1254,6 @@ static void nxp_fspi_remove(struct platform_device *pdev)
nxp_fspi_clk_disable_unprep(f);
mutex_destroy(&f->lock);
if (f->ahb_addr)
iounmap(f->ahb_addr);
}