Unverified Commit 478cc2fc authored by Yang Yingliang's avatar Yang Yingliang Committed by Mark Brown
Browse files

spi: xtensa-xtfpga: Switch to use devm_spi_alloc_master() 



Switch to use devm_spi_alloc_master() to simpify error path.

Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
Tested-by: default avatarMax Filippov <jcmvbkbc@gmail.com>
Acked-by: default avatarMax Filippov <jcmvbkbc@gmail.com>
Link: https://lore.kernel.org/r/20220920114448.2681053-1-yangyingliang@huawei.com


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

drivers/spi/spi-xtensa-xtfpga.c

+5 −11
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ static int xtfpga_spi_probe(struct platform_device *pdev) 
	int ret;

	struct spi_master *master;



	master = spi_alloc_master(&pdev->dev, sizeof(struct xtfpga_spi));

	master = devm_spi_alloc_master(&pdev->dev, sizeof(struct xtfpga_spi));

	if (!master)

		return -ENOMEM;
@@ -97,30 +97,24 @@ static int xtfpga_spi_probe(struct platform_device *pdev) 
	xspi->bitbang.chipselect = xtfpga_spi_chipselect;

	xspi->bitbang.txrx_word[SPI_MODE_0] = xtfpga_spi_txrx_word;

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

	if (IS_ERR(xspi->regs)) {

		ret = PTR_ERR(xspi->regs);

		goto err;

	}

	if (IS_ERR(xspi->regs))

		return PTR_ERR(xspi->regs);



	xtfpga_spi_write32(xspi, XTFPGA_SPI_START, 0);

	usleep_range(1000, 2000);

	if (xtfpga_spi_read32(xspi, XTFPGA_SPI_BUSY)) {

		dev_err(&pdev->dev, "Device stuck in busy state\n");

		ret = -EBUSY;

		goto err;

		return -EBUSY;

	}



	ret = spi_bitbang_start(&xspi->bitbang);

	if (ret < 0) {

		dev_err(&pdev->dev, "spi_bitbang_start failed\n");

		goto err;

		return ret;

	}



	platform_set_drvdata(pdev, master);

	return 0;

err:

	spi_master_put(master);

	return ret;

}



static int xtfpga_spi_remove(struct platform_device *pdev)