1 files changed, 9 insertions, 6 deletions

diff --git a/drivers/watchdog/mpc8xxx_wdt.c b/drivers/watchdog/mpc8xxx_wdt.c
index 8fa213cdb499..ea438ad53055 100644
--- a/drivers/watchdog/mpc8xxx_wdt.c
+++ b/drivers/watchdog/mpc8xxx_wdt.c
@@ -185,15 +185,18 @@ static struct miscdevice mpc8xxx_wdt_miscdev = {
         .fops   = &mpc8xxx_wdt_fops,
 };
 
-static int __devinit mpc8xxx_wdt_probe(struct platform_device *ofdev,
-                                       const struct of_device_id *match)
+static int __devinit mpc8xxx_wdt_probe(struct platform_device *ofdev)
 {
         int ret;
         struct device_node *np = ofdev->dev.of_node;
-        struct mpc8xxx_wdt_type *wdt_type = match->data;
+        struct mpc8xxx_wdt_type *wdt_type;
         u32 freq = fsl_get_sys_freq();
         bool enabled;
 
+        if (!ofdev->dev.of_match)
+                return -EINVAL;
+        wdt_type = match->data;
+
         if (!freq || freq == -1)
                 return -EINVAL;
 
@@ -272,7 +275,7 @@ static const struct of_device_id mpc8xxx_wdt_match[] = {
 };
 MODULE_DEVICE_TABLE(of, mpc8xxx_wdt_match);
 
-static struct of_platform_driver mpc8xxx_wdt_driver = {
+static struct platform_driver mpc8xxx_wdt_driver = {
         .probe          = mpc8xxx_wdt_probe,
         .remove         = __devexit_p(mpc8xxx_wdt_remove),
         .driver = {
@@ -308,13 +311,13 @@ module_init(mpc8xxx_wdt_init_late);
 
 static int __init mpc8xxx_wdt_init(void)
 {
-        return of_register_platform_driver(&mpc8xxx_wdt_driver);
+        return platform_driver_register(&mpc8xxx_wdt_driver);
 }
 arch_initcall(mpc8xxx_wdt_init);
 
 static void __exit mpc8xxx_wdt_exit(void)
 {
-        of_unregister_platform_driver(&mpc8xxx_wdt_driver);
+        platform_driver_unregister(&mpc8xxx_wdt_driver);
 }
 module_exit(mpc8xxx_wdt_exit);