diff options
Diffstat (limited to 'drivers/tty/serial/mpc52xx_uart.c')
-rw-r--r-- | drivers/tty/serial/mpc52xx_uart.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/drivers/tty/serial/mpc52xx_uart.c b/drivers/tty/serial/mpc52xx_uart.c index 126ec7f568ec..a0bcd8a3758d 100644 --- a/drivers/tty/serial/mpc52xx_uart.c +++ b/drivers/tty/serial/mpc52xx_uart.c | |||
@@ -1302,8 +1302,7 @@ static struct of_device_id mpc52xx_uart_of_match[] = { | |||
1302 | {}, | 1302 | {}, |
1303 | }; | 1303 | }; |
1304 | 1304 | ||
1305 | static int __devinit | 1305 | static int __devinit mpc52xx_uart_of_probe(struct platform_device *op) |
1306 | mpc52xx_uart_of_probe(struct platform_device *op, const struct of_device_id *match) | ||
1307 | { | 1306 | { |
1308 | int idx = -1; | 1307 | int idx = -1; |
1309 | unsigned int uartclk; | 1308 | unsigned int uartclk; |
@@ -1311,8 +1310,6 @@ mpc52xx_uart_of_probe(struct platform_device *op, const struct of_device_id *mat | |||
1311 | struct resource res; | 1310 | struct resource res; |
1312 | int ret; | 1311 | int ret; |
1313 | 1312 | ||
1314 | dev_dbg(&op->dev, "mpc52xx_uart_probe(op=%p, match=%p)\n", op, match); | ||
1315 | |||
1316 | /* Check validity & presence */ | 1313 | /* Check validity & presence */ |
1317 | for (idx = 0; idx < MPC52xx_PSC_MAXNUM; idx++) | 1314 | for (idx = 0; idx < MPC52xx_PSC_MAXNUM; idx++) |
1318 | if (mpc52xx_uart_nodes[idx] == op->dev.of_node) | 1315 | if (mpc52xx_uart_nodes[idx] == op->dev.of_node) |
@@ -1453,7 +1450,7 @@ mpc52xx_uart_of_enumerate(void) | |||
1453 | 1450 | ||
1454 | MODULE_DEVICE_TABLE(of, mpc52xx_uart_of_match); | 1451 | MODULE_DEVICE_TABLE(of, mpc52xx_uart_of_match); |
1455 | 1452 | ||
1456 | static struct of_platform_driver mpc52xx_uart_of_driver = { | 1453 | static struct platform_driver mpc52xx_uart_of_driver = { |
1457 | .probe = mpc52xx_uart_of_probe, | 1454 | .probe = mpc52xx_uart_of_probe, |
1458 | .remove = mpc52xx_uart_of_remove, | 1455 | .remove = mpc52xx_uart_of_remove, |
1459 | #ifdef CONFIG_PM | 1456 | #ifdef CONFIG_PM |
@@ -1497,9 +1494,9 @@ mpc52xx_uart_init(void) | |||
1497 | return ret; | 1494 | return ret; |
1498 | } | 1495 | } |
1499 | 1496 | ||
1500 | ret = of_register_platform_driver(&mpc52xx_uart_of_driver); | 1497 | ret = platform_driver_register(&mpc52xx_uart_of_driver); |
1501 | if (ret) { | 1498 | if (ret) { |
1502 | printk(KERN_ERR "%s: of_register_platform_driver failed (%i)\n", | 1499 | printk(KERN_ERR "%s: platform_driver_register failed (%i)\n", |
1503 | __FILE__, ret); | 1500 | __FILE__, ret); |
1504 | uart_unregister_driver(&mpc52xx_uart_driver); | 1501 | uart_unregister_driver(&mpc52xx_uart_driver); |
1505 | return ret; | 1502 | return ret; |
@@ -1514,7 +1511,7 @@ mpc52xx_uart_exit(void) | |||
1514 | if (psc_ops->fifoc_uninit) | 1511 | if (psc_ops->fifoc_uninit) |
1515 | psc_ops->fifoc_uninit(); | 1512 | psc_ops->fifoc_uninit(); |
1516 | 1513 | ||
1517 | of_unregister_platform_driver(&mpc52xx_uart_of_driver); | 1514 | platform_driver_unregister(&mpc52xx_uart_of_driver); |
1518 | uart_unregister_driver(&mpc52xx_uart_driver); | 1515 | uart_unregister_driver(&mpc52xx_uart_driver); |
1519 | } | 1516 | } |
1520 | 1517 | ||