[PATCH 03/13] serial: 8250_dma: Support for deferred probing when requesting DMA channels

Peter Ujfalusi
2015-05-26T13:26:41Z

Switch to use ma_request_slave_channel_compat_reason() to request the DMA
channels. In case of error, return the error code we received including
-EPROBE_DEFER

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
CC: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
drivers/tty/serial/8250/8250_dma.c | 18 ++++++++----------
1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/drivers/tty/serial/8250/8250_dma.c b/drivers/tty/serial/8250/8250_dma.c
index 21d01a491405..a617eca4e97d 100644
--- a/drivers/tty/serial/8250/8250_dma.c
+++ b/drivers/tty/serial/8250/8250_dma.c
@@ -182,21 +182,19 @@ int serial8250_request_dma(struct uart_8250_port *p)
dma_cap_set(DMA_SLAVE, mask);

/* Get a channel for RX */
- dma->rxchan = dma_request_slave_channel_compat(mask,
- dma->fn, dma->rx_param,
- p->port.dev, "rx");
- if (!dma->rxchan)
- return -ENODEV;
+ dma->rxchan = dma_request_slave_channel_compat_reason(mask, dma->fn,
+ dma->rx_param, p->port.dev, "rx");
+ if (IS_ERR(dma->rxchan))
+ return PTR_ERR(dma->rxchan);

dmaengine_slave_config(dma->rxchan, &dma->rxconf);

/* Get a channel for TX */
- dma->txchan = dma_request_slave_channel_compat(mask,
- dma->fn, dma->tx_param,
- p->port.dev, "tx");
- if (!dma->txchan) {
+ dma->txchan = dma_request_slave_channel_compat_reason(mask, dma->fn,
+ dma->tx_param, p->port.dev, "tx");
+ if (IS_ERR(dma->txchan)) {
dma_release_channel(dma->rxchan);
- return -ENODEV;
+ return PTR_ERR(dma->txchan);
}

dmaengine_slave_config(dma->txchan, &dma->txconf);
--
2.3.5