serial: samsung: Simplify DMA engine initialization code

dma_request_slave_channel_compat() requires filter function and mask, which
are not needed on device tree based platforms, so simplify the code by
calling the more appropriate dma_request_chan() function. This additionally
gives us proper error handling, because the new function returns error
codes instead of NULL on failure.

Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Reviewed-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/tty/serial/samsung.c b/drivers/tty/serial/samsung.c
index f44615fa474de233748b4f72133b8bf3fc272bf5..a9b309ba24a430e8b99debbc2205b93b23c22344 100644 (file)
--- a/drivers/tty/serial/samsung.c
+++ b/drivers/tty/serial/samsung.c
@@ -859,7 +859,6 @@ static void s3c24xx_serial_break_ctl(struct uart_port *port, int break_state)
 static int s3c24xx_serial_request_dma(struct s3c24xx_uart_port *p)
 {
        struct s3c24xx_uart_dma *dma = p->dma;
-       dma_cap_mask_t mask;
        unsigned long flags;
 
        /* Default slave configuration parameters */
@@ -876,21 +875,17 @@ static int s3c24xx_serial_request_dma(struct s3c24xx_uart_port *p)
        else
                dma->tx_conf.dst_maxburst = 1;
 
-       dma_cap_zero(mask);
-       dma_cap_set(DMA_SLAVE, mask);
+       dma->rx_chan = dma_request_chan(p->port.dev, "rx");
 
-       dma->rx_chan = dma_request_slave_channel_compat(mask, dma->fn,
-                                       dma->rx_param, p->port.dev, "rx");
-       if (!dma->rx_chan)
-               return -ENODEV;
+       if (IS_ERR(dma->rx_chan))
+               return PTR_ERR(dma->rx_chan);
 
        dmaengine_slave_config(dma->rx_chan, &dma->rx_conf);
 
-       dma->tx_chan = dma_request_slave_channel_compat(mask, dma->fn,
-                                       dma->tx_param, p->port.dev, "tx");
-       if (!dma->tx_chan) {
+       dma->tx_chan = dma_request_chan(p->port.dev, "tx");
+       if (IS_ERR(dma->tx_chan)) {
                dma_release_channel(dma->rx_chan);
-               return -ENODEV;
+               return PTR_ERR(dma->tx_chan);
        }
 
        dmaengine_slave_config(dma->tx_chan, &dma->tx_conf);

diff --git a/drivers/tty/serial/samsung.h b/drivers/tty/serial/samsung.h
index a04acef1cb20f0f80cf18d08be3a6fbba409b946..965199b6c16f658490222ade3507f68328c53d56 100644 (file)
--- a/drivers/tty/serial/samsung.h
+++ b/drivers/tty/serial/samsung.h
@@ -44,10 +44,6 @@ struct s3c24xx_serial_drv_data {
 };
 
 struct s3c24xx_uart_dma {
-       dma_filter_fn                   fn;
-       void                            *rx_param;
-       void                            *tx_param;
-
        unsigned int                    rx_chan_id;
        unsigned int                    tx_chan_id;