diff options
Diffstat (limited to 'drivers/mtd/nand/mpc5121_nfc.c')
-rw-r--r-- | drivers/mtd/nand/mpc5121_nfc.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/mtd/nand/mpc5121_nfc.c b/drivers/mtd/nand/mpc5121_nfc.c index ddaf0011aa8..0b81b5b499d 100644 --- a/drivers/mtd/nand/mpc5121_nfc.c +++ b/drivers/mtd/nand/mpc5121_nfc.c | |||
@@ -651,8 +651,7 @@ static void mpc5121_nfc_free(struct device *dev, struct mtd_info *mtd) | |||
651 | iounmap(prv->csreg); | 651 | iounmap(prv->csreg); |
652 | } | 652 | } |
653 | 653 | ||
654 | static int __devinit mpc5121_nfc_probe(struct platform_device *op, | 654 | static int __devinit mpc5121_nfc_probe(struct platform_device *op) |
655 | const struct of_device_id *match) | ||
656 | { | 655 | { |
657 | struct device_node *rootnode, *dn = op->dev.of_node; | 656 | struct device_node *rootnode, *dn = op->dev.of_node; |
658 | struct device *dev = &op->dev; | 657 | struct device *dev = &op->dev; |
@@ -892,7 +891,7 @@ static struct of_device_id mpc5121_nfc_match[] __devinitdata = { | |||
892 | {}, | 891 | {}, |
893 | }; | 892 | }; |
894 | 893 | ||
895 | static struct of_platform_driver mpc5121_nfc_driver = { | 894 | static struct platform_driver mpc5121_nfc_driver = { |
896 | .probe = mpc5121_nfc_probe, | 895 | .probe = mpc5121_nfc_probe, |
897 | .remove = __devexit_p(mpc5121_nfc_remove), | 896 | .remove = __devexit_p(mpc5121_nfc_remove), |
898 | .driver = { | 897 | .driver = { |
@@ -904,14 +903,14 @@ static struct of_platform_driver mpc5121_nfc_driver = { | |||
904 | 903 | ||
905 | static int __init mpc5121_nfc_init(void) | 904 | static int __init mpc5121_nfc_init(void) |
906 | { | 905 | { |
907 | return of_register_platform_driver(&mpc5121_nfc_driver); | 906 | return platform_driver_register(&mpc5121_nfc_driver); |
908 | } | 907 | } |
909 | 908 | ||
910 | module_init(mpc5121_nfc_init); | 909 | module_init(mpc5121_nfc_init); |
911 | 910 | ||
912 | static void __exit mpc5121_nfc_cleanup(void) | 911 | static void __exit mpc5121_nfc_cleanup(void) |
913 | { | 912 | { |
914 | of_unregister_platform_driver(&mpc5121_nfc_driver); | 913 | platform_driver_unregister(&mpc5121_nfc_driver); |
915 | } | 914 | } |
916 | 915 | ||
917 | module_exit(mpc5121_nfc_cleanup); | 916 | module_exit(mpc5121_nfc_cleanup); |