Unverified Commit d3bb2cb0 authored by Christophe JAILLET's avatar Christophe JAILLET Committed by Mark Brown
Browse files

spi: ingenic: convert not to use dma_request_slave_channel() 



dma_request_slave_channel() is deprecated. dma_request_chan() should
be used directly instead.

Switch to the preferred function and update the error handling accordingly.

Signed-off-by: default avatarChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Link: https://lore.kernel.org/r/1c88236b5d6bff0af902492ea9e066c8cb0dfef5.1700391566.git.christophe.jaillet@wanadoo.fr


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

drivers/spi/spi-ingenic.c

+9 −6
Original line number Diff line number Diff line
@@ -346,14 +346,17 @@ static bool spi_ingenic_can_dma(struct spi_controller *ctlr, 
static int spi_ingenic_request_dma(struct spi_controller *ctlr,

				   struct device *dev)

{

	ctlr->dma_tx = dma_request_slave_channel(dev, "tx");

	if (!ctlr->dma_tx)

		return -ENODEV;

	struct dma_chan *chan;



	ctlr->dma_rx = dma_request_slave_channel(dev, "rx");

	chan = dma_request_chan(dev, "tx");

	if (IS_ERR(chan))

		return PTR_ERR(chan);

	ctlr->dma_tx = chan;



	if (!ctlr->dma_rx)

		return -ENODEV;

	chan = dma_request_chan(dev, "rx");

	if (IS_ERR(chan))

		return PTR_ERR(chan);

	ctlr->dma_rx = chan;



	ctlr->can_dma = spi_ingenic_can_dma;