diff options
| author | Christophe JAILLET <christophe.jaillet@wanadoo.fr> | 2023-11-19 11:59:50 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2023-11-20 13:13:37 +0000 |
| commit | d3bb2cb0f1769cb3424f3102ebcde51d18065424 (patch) | |
| tree | 4ee0aab85bc49851f8fc256fd27e0467c704edc6 /drivers/spi/spi-ingenic.c | |
| parent | 18a813a1f94abbab14248071ca551e491bbc2abe (diff) | |
| download | lwn-d3bb2cb0f1769cb3424f3102ebcde51d18065424.tar.gz lwn-d3bb2cb0f1769cb3424f3102ebcde51d18065424.zip | |
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: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Link: https://lore.kernel.org/r/1c88236b5d6bff0af902492ea9e066c8cb0dfef5.1700391566.git.christophe.jaillet@wanadoo.fr
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'drivers/spi/spi-ingenic.c')
| -rw-r--r-- | drivers/spi/spi-ingenic.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/drivers/spi/spi-ingenic.c b/drivers/spi/spi-ingenic.c index cc366936d72b..003a6d21c4c3 100644 --- a/drivers/spi/spi-ingenic.c +++ b/drivers/spi/spi-ingenic.c @@ -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; |