Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-14 23:25:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

serial: mxs: remove the MXS_AUART_DMA_CONFIG

Browse Source 
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>
This commit is contained in:
Huang Shijie 2013-08-03 10:09:15 -04:00 committed by Greg Kroah-Hartman
parent 8418e67d95
commit afab220396
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/tty/serial/mxs-auart.c
View File

@ -133,7 +133,6 @@ enum mxs_auart_type {
struct mxs_auart_port { struct mxs_auart_port {
struct uart_port port; struct uart_port port;
#define MXS_AUART_DMA_CONFIG 0x1
#define MXS_AUART_DMA_ENABLED 0x2 #define MXS_AUART_DMA_ENABLED 0x2
#define MXS_AUART_DMA_TX_SYNC 2 /* bit 2 */ #define MXS_AUART_DMA_TX_SYNC 2 /* bit 2 */
#define MXS_AUART_DMA_RX_READY 3 /* bit 3 */ #define MXS_AUART_DMA_RX_READY 3 /* bit 3 */
@ -640,7 +639,7 @@ static void mxs_auart_settermios(struct uart_port *u,
* we can only implement the DMA support for auart * we can only implement the DMA support for auart
* in mx28. * in mx28.
*/ */
if (is_imx28_auart(s) && (s->flags & MXS_AUART_DMA_CONFIG) if (is_imx28_auart(s)
&& test_bit(MXS_AUART_RTSCTS, &s->flags)) { && test_bit(MXS_AUART_RTSCTS, &s->flags)) {
if (!mxs_auart_dma_init(s)) if (!mxs_auart_dma_init(s))
/* enable DMA tranfer */ /* enable DMA tranfer */
@ -1009,8 +1008,6 @@ static int serial_mxs_probe_dt(struct mxs_auart_port *s,
} }
s->port.line = ret; s->port.line = ret;
s->flags |= MXS_AUART_DMA_CONFIG;
if (of_get_property(np, "fsl,uart-has-rtscts", NULL)) if (of_get_property(np, "fsl,uart-has-rtscts", NULL))
set_bit(MXS_AUART_RTSCTS, &s->flags); set_bit(MXS_AUART_RTSCTS, &s->flags);