diff options
author | Huang Shijie <shijie8@gmail.com> | 2013-08-03 10:09:15 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-08-05 03:05:17 -0400 |
commit | afab220396bf9a728098996d73775fd1aaa712f8 (patch) | |
tree | 630667f735d221ba67f8fffd2cc96976ecb60144 | |
parent | 8418e67d95235c3449df6f2e5b33863343fa72f9 (diff) |
serial: mxs: remove the MXS_AUART_DMA_CONFIG
The MXS_AUART_DMA_CONFIG is originally used to check if the DT node
is configured with the DMA property.
But now, the MXS_AUART_DMA_CONFIG is set unconditionally in the
serial_mxs_probe_dt(), so the check in the mxs_auart_settermios() is
not necessary anymore. This patch removes this macro.
Signed-off-by: Huang Shijie <shijie8@gmail.com>
Acked-by: Shawn Guo <shawn.guo@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | drivers/tty/serial/mxs-auart.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/tty/serial/mxs-auart.c b/drivers/tty/serial/mxs-auart.c index eac7b585bc0c..10e9d70b5c40 100644 --- a/drivers/tty/serial/mxs-auart.c +++ b/drivers/tty/serial/mxs-auart.c | |||
@@ -133,7 +133,6 @@ enum mxs_auart_type { | |||
133 | struct mxs_auart_port { | 133 | struct mxs_auart_port { |
134 | struct uart_port port; | 134 | struct uart_port port; |
135 | 135 | ||
136 | #define MXS_AUART_DMA_CONFIG 0x1 | ||
137 | #define MXS_AUART_DMA_ENABLED 0x2 | 136 | #define MXS_AUART_DMA_ENABLED 0x2 |
138 | #define MXS_AUART_DMA_TX_SYNC 2 /* bit 2 */ | 137 | #define MXS_AUART_DMA_TX_SYNC 2 /* bit 2 */ |
139 | #define MXS_AUART_DMA_RX_READY 3 /* bit 3 */ | 138 | #define MXS_AUART_DMA_RX_READY 3 /* bit 3 */ |
@@ -640,7 +639,7 @@ static void mxs_auart_settermios(struct uart_port *u, | |||
640 | * we can only implement the DMA support for auart | 639 | * we can only implement the DMA support for auart |
641 | * in mx28. | 640 | * in mx28. |
642 | */ | 641 | */ |
643 | if (is_imx28_auart(s) && (s->flags & MXS_AUART_DMA_CONFIG) | 642 | if (is_imx28_auart(s) |
644 | && test_bit(MXS_AUART_RTSCTS, &s->flags)) { | 643 | && test_bit(MXS_AUART_RTSCTS, &s->flags)) { |
645 | if (!mxs_auart_dma_init(s)) | 644 | if (!mxs_auart_dma_init(s)) |
646 | /* enable DMA tranfer */ | 645 | /* enable DMA tranfer */ |
@@ -1009,8 +1008,6 @@ static int serial_mxs_probe_dt(struct mxs_auart_port *s, | |||
1009 | } | 1008 | } |
1010 | s->port.line = ret; | 1009 | s->port.line = ret; |
1011 | 1010 | ||
1012 | s->flags |= MXS_AUART_DMA_CONFIG; | ||
1013 | |||
1014 | if (of_get_property(np, "fsl,uart-has-rtscts", NULL)) | 1011 | if (of_get_property(np, "fsl,uart-has-rtscts", NULL)) |
1015 | set_bit(MXS_AUART_RTSCTS, &s->flags); | 1012 | set_bit(MXS_AUART_RTSCTS, &s->flags); |
1016 | 1013 | ||