projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
asm-generic: remove fastcall
[powerpc.git]
/
drivers
/
serial
/
imx.c
diff --git
a/drivers/serial/imx.c
b/drivers/serial/imx.c
index
e42faa4
..
56af1f5
100644
(file)
--- a/
drivers/serial/imx.c
+++ b/
drivers/serial/imx.c
@@
-308,7
+308,7
@@
static void imx_start_tx(struct uart_port *port)
static irqreturn_t imx_rtsint(int irq, void *dev_id)
{
static irqreturn_t imx_rtsint(int irq, void *dev_id)
{
- struct imx_port *sport =
(struct imx_port *)
dev_id;
+ struct imx_port *sport = dev_id;
unsigned int val = readl(sport->port.membase + USR1) & USR1_RTSS;
unsigned long flags;
unsigned int val = readl(sport->port.membase + USR1) & USR1_RTSS;
unsigned long flags;
@@
-324,7
+324,7
@@
static irqreturn_t imx_rtsint(int irq, void *dev_id)
static irqreturn_t imx_txint(int irq, void *dev_id)
{
static irqreturn_t imx_txint(int irq, void *dev_id)
{
- struct imx_port *sport =
(struct imx_port *)
dev_id;
+ struct imx_port *sport = dev_id;
struct circ_buf *xmit = &sport->port.info->xmit;
unsigned long flags;
struct circ_buf *xmit = &sport->port.info->xmit;
unsigned long flags;
@@
-1114,8
+1114,8
@@
static int __init imx_serial_init(void)
static void __exit imx_serial_exit(void)
{
static void __exit imx_serial_exit(void)
{
- uart_unregister_driver(&imx_reg);
platform_driver_unregister(&serial_imx_driver);
platform_driver_unregister(&serial_imx_driver);
+ uart_unregister_driver(&imx_reg);
}
module_init(imx_serial_init);
}
module_init(imx_serial_init);