diff options
Diffstat (limited to 'drivers/tty/serial/apbuart.c')
-rw-r--r-- | drivers/tty/serial/apbuart.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/tty/serial/apbuart.c b/drivers/tty/serial/apbuart.c index 095a5d56261..1ab999b04ef 100644 --- a/drivers/tty/serial/apbuart.c +++ b/drivers/tty/serial/apbuart.c | |||
@@ -553,8 +553,7 @@ static struct uart_driver grlib_apbuart_driver = { | |||
553 | /* OF Platform Driver */ | 553 | /* OF Platform Driver */ |
554 | /* ======================================================================== */ | 554 | /* ======================================================================== */ |
555 | 555 | ||
556 | static int __devinit apbuart_probe(struct platform_device *op, | 556 | static int __devinit apbuart_probe(struct platform_device *op) |
557 | const struct of_device_id *match) | ||
558 | { | 557 | { |
559 | int i = -1; | 558 | int i = -1; |
560 | struct uart_port *port = NULL; | 559 | struct uart_port *port = NULL; |
@@ -587,7 +586,7 @@ static struct of_device_id __initdata apbuart_match[] = { | |||
587 | {}, | 586 | {}, |
588 | }; | 587 | }; |
589 | 588 | ||
590 | static struct of_platform_driver grlib_apbuart_of_driver = { | 589 | static struct platform_driver grlib_apbuart_of_driver = { |
591 | .probe = apbuart_probe, | 590 | .probe = apbuart_probe, |
592 | .driver = { | 591 | .driver = { |
593 | .owner = THIS_MODULE, | 592 | .owner = THIS_MODULE, |
@@ -676,10 +675,10 @@ static int __init grlib_apbuart_init(void) | |||
676 | return ret; | 675 | return ret; |
677 | } | 676 | } |
678 | 677 | ||
679 | ret = of_register_platform_driver(&grlib_apbuart_of_driver); | 678 | ret = platform_driver_register(&grlib_apbuart_of_driver); |
680 | if (ret) { | 679 | if (ret) { |
681 | printk(KERN_ERR | 680 | printk(KERN_ERR |
682 | "%s: of_register_platform_driver failed (%i)\n", | 681 | "%s: platform_driver_register failed (%i)\n", |
683 | __FILE__, ret); | 682 | __FILE__, ret); |
684 | uart_unregister_driver(&grlib_apbuart_driver); | 683 | uart_unregister_driver(&grlib_apbuart_driver); |
685 | return ret; | 684 | return ret; |
@@ -697,7 +696,7 @@ static void __exit grlib_apbuart_exit(void) | |||
697 | &grlib_apbuart_ports[i]); | 696 | &grlib_apbuart_ports[i]); |
698 | 697 | ||
699 | uart_unregister_driver(&grlib_apbuart_driver); | 698 | uart_unregister_driver(&grlib_apbuart_driver); |
700 | of_unregister_platform_driver(&grlib_apbuart_of_driver); | 699 | platform_driver_unregister(&grlib_apbuart_of_driver); |
701 | } | 700 | } |
702 | 701 | ||
703 | module_init(grlib_apbuart_init); | 702 | module_init(grlib_apbuart_init); |