AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

serial: sh-sci: Kill off some DMA ifdeffery.

Browse Source 
There's nothing worth hiding under the ifdef in the platform DMA
definitions, and we certainly don't want board code adding this in to
their platform data definitions, so we always expose the slave rx/tx
and device pointer members instead.

Signed-off-by: Paul Mundt <lethal@linux-sh.org>
This commit is contained in:
Paul Mundt 2011-01-19 15:37:31 +09:00
parent ce6738b60d
commit 27bd107525
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/serial/sh-sci.c
View File

@ -1423,6 +1423,14 @@ static void sci_free_dma(struct uart_port *port)
if (s->chan_rx) if (s->chan_rx)
sci_rx_dma_release(s, false); sci_rx_dma_release(s, false);
} }
#else
static inline void sci_request_dma(struct uart_port *port)
{
}
static inline void sci_free_dma(struct uart_port *port)
{
}
#endif #endif
static int sci_startup(struct uart_port *port) static int sci_startup(struct uart_port *port)
@ -1435,9 +1443,7 @@ static int sci_startup(struct uart_port *port)
s->enable(port); s->enable(port);
sci_request_irq(s); sci_request_irq(s);
#ifdef CONFIG_SERIAL_SH_SCI_DMA
sci_request_dma(port); sci_request_dma(port);
#endif
sci_start_tx(port); sci_start_tx(port);
sci_start_rx(port); sci_start_rx(port);
@ -1452,9 +1458,7 @@ static void sci_shutdown(struct uart_port *port)
sci_stop_rx(port); sci_stop_rx(port);
sci_stop_tx(port); sci_stop_tx(port);
#ifdef CONFIG_SERIAL_SH_SCI_DMA
sci_free_dma(port); sci_free_dma(port);
#endif
sci_free_irq(s); sci_free_irq(s);
if (s->disable) if (s->disable)
@ -1726,11 +1730,9 @@ static int __devinit sci_init_single(struct platform_device *dev,
*/ */
port->irq = p->irqs[SCIx_TXI_IRQ]; port->irq = p->irqs[SCIx_TXI_IRQ];
#ifdef CONFIG_SERIAL_SH_SCI_DMA
if (p->dma_dev) if (p->dma_dev)
dev_dbg(port->dev, "DMA device %p, tx %d, rx %d\n", dev_dbg(port->dev, "DMA device %p, tx %d, rx %d\n",
p->dma_dev, p->dma_slave_tx, p->dma_slave_rx); p->dma_dev, p->dma_slave_tx, p->dma_slave_rx);
#endif
return 0; return 0;
} }

6
include/linux/serial_sci.h
View File

@ -58,10 +58,8 @@ struct plat_sci_port {
struct device *dma_dev; struct device *dma_dev;
#ifdef CONFIG_SERIAL_SH_SCI_DMA unsigned int dma_slave_tx;
unsigned int dma_slave_tx; unsigned int dma_slave_rx;
unsigned int dma_slave_rx;
#endif
}; };
#endif /* __LINUX_SERIAL_SCI_H */ #endif /* __LINUX_SERIAL_SCI_H */