Unverified Commit 2d064581 authored by Yang Yingliang's avatar Yang Yingliang Committed by Mark Brown
Browse files

spi: xilinx: 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>
Reviewed-by: default avatarLukas Wunner <lukas@wunner.de>
Link: https://lore.kernel.org/r/20220920114615.2681751-1-yangyingliang@huawei.com


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

drivers/spi/spi-xilinx.c

+6 −14
Original line number Diff line number Diff line
@@ -421,7 +421,7 @@ static int xilinx_spi_probe(struct platform_device *pdev) 
		return -EINVAL;

	}



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

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

	if (!master)

		return -ENODEV;
@@ -439,10 +439,8 @@ static int xilinx_spi_probe(struct platform_device *pdev) 


	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	xspi->regs = devm_ioremap_resource(&pdev->dev, res);

	if (IS_ERR(xspi->regs)) {

		ret = PTR_ERR(xspi->regs);

		goto put_master;

	}

	if (IS_ERR(xspi->regs))

		return PTR_ERR(xspi->regs);



	master->bus_num = pdev->id;

	master->num_chipselect = num_cs;
@@ -472,14 +470,13 @@ static int xilinx_spi_probe(struct platform_device *pdev) 


	xspi->irq = platform_get_irq(pdev, 0);

	if (xspi->irq < 0 && xspi->irq != -ENXIO) {

		ret = xspi->irq;

		goto put_master;

		return xspi->irq;

	} else if (xspi->irq >= 0) {

		/* Register for SPI Interrupt */

		ret = devm_request_irq(&pdev->dev, xspi->irq, xilinx_spi_irq, 0,

				dev_name(&pdev->dev), xspi);

		if (ret)

			goto put_master;

			return ret;

	}



	/* SPI controller initializations */
@@ -488,7 +485,7 @@ static int xilinx_spi_probe(struct platform_device *pdev) 
	ret = spi_bitbang_start(&xspi->bitbang);

	if (ret) {

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

		goto put_master;

		return ret;

	}



	dev_info(&pdev->dev, "at %pR, irq=%d\n", res, xspi->irq);
@@ -500,11 +497,6 @@ static int xilinx_spi_probe(struct platform_device *pdev) 


	platform_set_drvdata(pdev, master);

	return 0;



put_master:

	spi_master_put(master);



	return ret;

}



static int xilinx_spi_remove(struct platform_device *pdev)