Merge branch 'x86-boot-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[firefly-linux-kernel-4.4.55.git] / drivers / watchdog / cpwd.c

diff --git a/drivers/watchdog/cpwd.c b/drivers/watchdog/cpwd.c
index 70387582843ff1f6c60d868c8c2807d41ad11c66..e55ed702209ff8450c3c4bb2bc9d62b5685aa1c6 100644 (file)
--- a/drivers/watchdog/cpwd.c
+++ b/drivers/watchdog/cpwd.c
@@ -21,7 +21,6 @@
 #include <linux/fs.h>
 #include <linux/errno.h>
 #include <linux/major.h>
-#include <linux/init.h>
 #include <linux/miscdevice.h>
 #include <linux/interrupt.h>
 #include <linux/ioport.h>
@@ -621,7 +620,7 @@ static int cpwd_probe(struct platform_device *op)
                        WD_BADMODEL);
        }
 
-       dev_set_drvdata(&op->dev, p);
+       platform_set_drvdata(op, p);
        cpwd_device = p;
        err = 0;
 
@@ -642,7 +641,7 @@ out_free:
 
 static int cpwd_remove(struct platform_device *op)
 {
-       struct cpwd *p = dev_get_drvdata(&op->dev);
+       struct cpwd *p = platform_get_drvdata(op);
        int i;
 
        for (i = 0; i < WD_NUMDEVS; i++) {