projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
watchdog
/
pnx4008_wdt.c
diff --git
a/drivers/watchdog/pnx4008_wdt.c
b/drivers/watchdog/pnx4008_wdt.c
index 4224b3ec83a5515dc76a57507ec81122dd9316e1..313cd1c6fda0efcfa03897f1d23fc18b138e3779 100644
(file)
--- a/
drivers/watchdog/pnx4008_wdt.c
+++ b/
drivers/watchdog/pnx4008_wdt.c
@@
-80,7
+80,7
@@
static unsigned int heartbeat = DEFAULT_HEARTBEAT;
static DEFINE_SPINLOCK(io_lock);
static void __iomem *wdt_base;
static DEFINE_SPINLOCK(io_lock);
static void __iomem *wdt_base;
-st
ruct clk
*wdt_clk;
+st
atic struct clk
*wdt_clk;
static int pnx4008_wdt_start(struct watchdog_device *wdd)
{
static int pnx4008_wdt_start(struct watchdog_device *wdd)
{
@@
-161,7
+161,7
@@
static int pnx4008_wdt_probe(struct platform_device *pdev)
if (IS_ERR(wdt_clk))
return PTR_ERR(wdt_clk);
if (IS_ERR(wdt_clk))
return PTR_ERR(wdt_clk);
- ret = clk_enable(wdt_clk);
+ ret = clk_
prepare_
enable(wdt_clk);
if (ret)
return ret;
if (ret)
return ret;
@@
-184,7
+184,7
@@
static int pnx4008_wdt_probe(struct platform_device *pdev)
return 0;
disable_clk:
return 0;
disable_clk:
- clk_disable(wdt_clk);
+ clk_disable
_unprepare
(wdt_clk);
return ret;
}
return ret;
}
@@
-192,7
+192,7
@@
static int pnx4008_wdt_remove(struct platform_device *pdev)
{
watchdog_unregister_device(&pnx4008_wdd);
{
watchdog_unregister_device(&pnx4008_wdd);
- clk_disable(wdt_clk);
+ clk_disable
_unprepare
(wdt_clk);
return 0;
}
return 0;
}