cs5535-mfgpt: reuse timers that have never been set up

[karo-tx-linux.git] / drivers / watchdog / cpwd.c

diff --git a/drivers/watchdog/cpwd.c b/drivers/watchdog/cpwd.c
index d62b9ce8f773cb0d402bb43794b121bddae02209..30a2512fd52e30fef23cdac728eae59d4b3803af 100644 (file)
--- a/drivers/watchdog/cpwd.c
+++ b/drivers/watchdog/cpwd.c
@@ -545,7 +545,7 @@ static int __devinit cpwd_probe(struct of_device *op,
                goto out;
        }
 
-       p->irq = op->irqs[0];
+       p->irq = op->archdata.irqs[0];
 
        spin_lock_init(&p->lock);
 
@@ -688,12 +688,12 @@ static struct of_platform_driver cpwd_driver = {
 
 static int __init cpwd_init(void)
 {
-       return of_register_driver(&cpwd_driver, &of_bus_type);
+       return of_register_platform_driver(&cpwd_driver);
 }
 
 static void __exit cpwd_exit(void)
 {
-       of_unregister_driver(&cpwd_driver);
+       of_unregister_platform_driver(&cpwd_driver);
 }
 
 module_init(cpwd_init);