hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

imx: serial: fix whitespaces (no changes in functionality) 

Signed-off-by: Oskar Schirmer <os@emlix.com>
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Oskar Schirmer 2009-06-11 14:35:01 +01:00 committed by Linus Torvalds
parent 3e3b5c0877
commit d3810cd4d7
1 changed files with 23 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
drivers/serial/imx.c
View File

@ -302,8 +302,7 @@ static inline void imx_transmit_buffer(struct imx_port *sport)
/* send xmit->buf[xmit->tail] /* send xmit->buf[xmit->tail]
* out the port here */ * out the port here */
writel(xmit->buf[xmit->tail], sport->port.membase + URTX0); writel(xmit->buf[xmit->tail], sport->port.membase + URTX0);
xmit->tail = (xmit->tail + 1) & xmit->tail = (xmit->tail + 1) & (UART_XMIT_SIZE - 1);
(UART_XMIT_SIZE - 1);
sport->port.icount.tx++; sport->port.icount.tx++;
if (uart_circ_empty(xmit)) if (uart_circ_empty(xmit))
break; break;
@ -395,8 +394,7 @@ static irqreturn_t imx_rxint(int irq, void *dev_id)
continue; continue;
} }
if (uart_handle_sysrq_char if (uart_handle_sysrq_char(&sport->port, (unsigned char)rx))
(&sport->port, (unsigned char)rx))
continue; continue;
if (rx & (URXD_PRERR | URXD_OVRRUN | URXD_FRMERR) ) { if (rx & (URXD_PRERR | URXD_OVRRUN | URXD_FRMERR) ) {
@ -471,26 +469,26 @@ static unsigned int imx_tx_empty(struct uart_port *port)
*/ */
static unsigned int imx_get_mctrl(struct uart_port *port) static unsigned int imx_get_mctrl(struct uart_port *port)
{ {
struct imx_port *sport = (struct imx_port *)port; struct imx_port *sport = (struct imx_port *)port;
unsigned int tmp = TIOCM_DSR | TIOCM_CAR; unsigned int tmp = TIOCM_DSR | TIOCM_CAR;
if (readl(sport->port.membase + USR1) & USR1_RTSS) if (readl(sport->port.membase + USR1) & USR1_RTSS)
tmp |= TIOCM_CTS; tmp |= TIOCM_CTS;
if (readl(sport->port.membase + UCR2) & UCR2_CTS) if (readl(sport->port.membase + UCR2) & UCR2_CTS)
tmp |= TIOCM_RTS; tmp |= TIOCM_RTS;
return tmp; return tmp;
} }
static void imx_set_mctrl(struct uart_port *port, unsigned int mctrl) static void imx_set_mctrl(struct uart_port *port, unsigned int mctrl)
{ {
struct imx_port *sport = (struct imx_port *)port; struct imx_port *sport = (struct imx_port *)port;
unsigned long temp; unsigned long temp;
temp = readl(sport->port.membase + UCR2) & ~UCR2_CTS; temp = readl(sport->port.membase + UCR2) & ~UCR2_CTS;
if (mctrl & TIOCM_RTS) if (mctrl & TIOCM_RTS)
temp |= UCR2_CTS; temp |= UCR2_CTS;
writel(temp, sport->port.membase + UCR2); writel(temp, sport->port.membase + UCR2);
@ -1072,22 +1070,22 @@ static struct uart_driver imx_reg = {
static int serial_imx_suspend(struct platform_device *dev, pm_message_t state) static int serial_imx_suspend(struct platform_device *dev, pm_message_t state)
{ {
struct imx_port *sport = platform_get_drvdata(dev); struct imx_port *sport = platform_get_drvdata(dev);
if (sport) if (sport)
uart_suspend_port(&imx_reg, &sport->port); uart_suspend_port(&imx_reg, &sport->port);
return 0; return 0;
} }
static int serial_imx_resume(struct platform_device *dev) static int serial_imx_resume(struct platform_device *dev)
{ {
struct imx_port *sport = platform_get_drvdata(dev); struct imx_port *sport = platform_get_drvdata(dev);
if (sport) if (sport)
uart_resume_port(&imx_reg, &sport->port); uart_resume_port(&imx_reg, &sport->port);
return 0; return 0;
} }
static int serial_imx_probe(struct platform_device *pdev) static int serial_imx_probe(struct platform_device *pdev)
@ -1143,7 +1141,7 @@ static int serial_imx_probe(struct platform_device *pdev)
imx_ports[pdev->id] = sport; imx_ports[pdev->id] = sport;
pdata = pdev->dev.platform_data; pdata = pdev->dev.platform_data;
if(pdata && (pdata->flags & IMXUART_HAVE_RTSCTS)) if (pdata && (pdata->flags & IMXUART_HAVE_RTSCTS))
sport->have_rtscts = 1; sport->have_rtscts = 1;
if (pdata->init) { if (pdata->init) {
@ -1193,13 +1191,13 @@ static int serial_imx_remove(struct platform_device *pdev)
} }
static struct platform_driver serial_imx_driver = { static struct platform_driver serial_imx_driver = {
.probe = serial_imx_probe, .probe = serial_imx_probe,
.remove = serial_imx_remove, .remove = serial_imx_remove,
.suspend = serial_imx_suspend, .suspend = serial_imx_suspend,
.resume = serial_imx_resume, .resume = serial_imx_resume,
.driver = { .driver = {
.name = "imx-uart", .name = "imx-uart",
.owner = THIS_MODULE, .owner = THIS_MODULE,
}, },
}; };