mmc: sdhci-of-arasan: add sdhci_arasan_voltage_switch for arasan,5.1

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

diff --git a/drivers/watchdog/ath79_wdt.c b/drivers/watchdog/ath79_wdt.c
index c97a47ca89710e69060e7301115d7fbec2b11c62..835d310081e19bbf7168f3c5d85d9bf09b5aa47d 100644 (file)
--- a/drivers/watchdog/ath79_wdt.c
+++ b/drivers/watchdog/ath79_wdt.c
@@ -23,7 +23,6 @@
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/fs.h>
-#include <linux/init.h>
 #include <linux/io.h>
 #include <linux/kernel.h>
 #include <linux/miscdevice.h>
@@ -266,7 +265,7 @@ static int ath79_wdt_probe(struct platform_device *pdev)
        if (IS_ERR(wdt_clk))
                return PTR_ERR(wdt_clk);
 
-       err = clk_enable(wdt_clk);
+       err = clk_prepare_enable(wdt_clk);
        if (err)
                return err;
 
@@ -297,14 +296,14 @@ static int ath79_wdt_probe(struct platform_device *pdev)
        return 0;
 
 err_clk_disable:
-       clk_disable(wdt_clk);
+       clk_disable_unprepare(wdt_clk);
        return err;
 }
 
 static int ath79_wdt_remove(struct platform_device *pdev)
 {
        misc_deregister(&ath79_wdt_miscdev);
-       clk_disable(wdt_clk);
+       clk_disable_unprepare(wdt_clk);
        return 0;
 }
 
@@ -327,7 +326,6 @@ static struct platform_driver ath79_wdt_driver = {
        .shutdown       = ath97_wdt_shutdown,
        .driver         = {
                .name   = DRIVER_NAME,
-               .owner  = THIS_MODULE,
                .of_match_table = of_match_ptr(ath79_wdt_match),
        },
 };
@@ -339,4 +337,3 @@ MODULE_AUTHOR("Gabor Juhos <juhosg@openwrt.org");
 MODULE_AUTHOR("Imre Kaloz <kaloz@openwrt.org");
 MODULE_LICENSE("GPL v2");
 MODULE_ALIAS("platform:" DRIVER_NAME);
-MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);