Unverified Commit 64640f6c authored by Jinjie Ruan's avatar Jinjie Ruan Committed by Mark Brown
Browse files

spi: zynqmp-gqspi: Use devm_spi_alloc_host() 



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

Signed-off-by: default avatarJinjie Ruan <ruanjinjie@huawei.com>
Acked-by: default avatarMichal Simek <michal.simek@amd.com>
Link: https://patch.msgid.link/20240826121421.3384792-2-ruanjinjie@huawei.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent e3de1d8d

drivers/spi/spi-zynqmp-gqspi.c

+6 −12
Original line number Diff line number Diff line
@@ -1224,7 +1224,7 @@ static int zynqmp_qspi_probe(struct platform_device *pdev) 
	u32 num_cs;

	const struct qspi_platform_data *p_data;



	ctlr = spi_alloc_host(&pdev->dev, sizeof(*xqspi));

	ctlr = devm_spi_alloc_host(&pdev->dev, sizeof(*xqspi));

	if (!ctlr)

		return -ENOMEM;
@@ -1238,29 +1238,25 @@ static int zynqmp_qspi_probe(struct platform_device *pdev) 
		xqspi->has_tapdelay = true;



	xqspi->regs = devm_platform_ioremap_resource(pdev, 0);

	if (IS_ERR(xqspi->regs)) {

		ret = PTR_ERR(xqspi->regs);

		goto remove_ctlr;

	}

	if (IS_ERR(xqspi->regs))

		return PTR_ERR(xqspi->regs);



	xqspi->pclk = devm_clk_get(&pdev->dev, "pclk");

	if (IS_ERR(xqspi->pclk)) {

		dev_err(dev, "pclk clock not found.\n");

		ret = PTR_ERR(xqspi->pclk);

		goto remove_ctlr;

		return PTR_ERR(xqspi->pclk);

	}



	xqspi->refclk = devm_clk_get(&pdev->dev, "ref_clk");

	if (IS_ERR(xqspi->refclk)) {

		dev_err(dev, "ref_clk clock not found.\n");

		ret = PTR_ERR(xqspi->refclk);

		goto remove_ctlr;

		return PTR_ERR(xqspi->refclk);

	}



	ret = clk_prepare_enable(xqspi->pclk);

	if (ret) {

		dev_err(dev, "Unable to enable APB clock.\n");

		goto remove_ctlr;

		return ret;

	}



	ret = clk_prepare_enable(xqspi->refclk);
@@ -1346,8 +1342,6 @@ static int zynqmp_qspi_probe(struct platform_device *pdev) 
	clk_disable_unprepare(xqspi->refclk);

clk_dis_pclk:

	clk_disable_unprepare(xqspi->pclk);

remove_ctlr:

	spi_controller_put(ctlr);



	return ret;

}