Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

watchdog: dw_wdt: use clk_prepare_enable and clk_disable_unprepare

This is necessary to make the driver work with platforms using the
common clock framework.

Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>

authored by

Heiko Stübner and committed by
Wim Van Sebroeck
280103e6 ad83c6cb

+5 -5
+5 -5
drivers/watchdog/dw_wdt.c
··· 255 255 #ifdef CONFIG_PM_SLEEP 256 256 static int dw_wdt_suspend(struct device *dev) 257 257 { 258 - clk_disable(dw_wdt.clk); 258 + clk_disable_unprepare(dw_wdt.clk); 259 259 260 260 return 0; 261 261 } 262 262 263 263 static int dw_wdt_resume(struct device *dev) 264 264 { 265 - int err = clk_enable(dw_wdt.clk); 265 + int err = clk_prepare_enable(dw_wdt.clk); 266 266 267 267 if (err) 268 268 return err; ··· 306 306 if (IS_ERR(dw_wdt.clk)) 307 307 return PTR_ERR(dw_wdt.clk); 308 308 309 - ret = clk_enable(dw_wdt.clk); 309 + ret = clk_prepare_enable(dw_wdt.clk); 310 310 if (ret) 311 311 return ret; 312 312 ··· 323 323 return 0; 324 324 325 325 out_disable_clk: 326 - clk_disable(dw_wdt.clk); 326 + clk_disable_unprepare(dw_wdt.clk); 327 327 328 328 return ret; 329 329 } ··· 332 332 { 333 333 misc_deregister(&dw_wdt_miscdev); 334 334 335 - clk_disable(dw_wdt.clk); 335 + clk_disable_unprepare(dw_wdt.clk); 336 336 337 337 return 0; 338 338 }