diff options
Diffstat (limited to 'drivers/clocksource/sh_tmu.c')
| -rw-r--r-- | drivers/clocksource/sh_tmu.c | 12 | 
1 files changed, 2 insertions, 10 deletions
diff --git a/drivers/clocksource/sh_tmu.c b/drivers/clocksource/sh_tmu.c index 17296288a20..80813576861 100644 --- a/drivers/clocksource/sh_tmu.c +++ b/drivers/clocksource/sh_tmu.c @@ -25,7 +25,6 @@  #include <linux/delay.h>  #include <linux/io.h>  #include <linux/clk.h> -#include <linux/pm_runtime.h>  #include <linux/irq.h>  #include <linux/err.h>  #include <linux/clocksource.h> @@ -110,12 +109,10 @@ static int sh_tmu_enable(struct sh_tmu_priv *p)  {  	int ret; -	/* wake up device and enable clock */ -	pm_runtime_get_sync(&p->pdev->dev); +	/* enable clock */  	ret = clk_enable(p->clk);  	if (ret) {  		dev_err(&p->pdev->dev, "cannot enable clock\n"); -		pm_runtime_put_sync(&p->pdev->dev);  		return ret;  	} @@ -144,9 +141,8 @@ static void sh_tmu_disable(struct sh_tmu_priv *p)  	/* disable interrupts in TMU block */  	sh_tmu_write(p, TCR, 0x0000); -	/* stop clock and mark device as idle */ +	/* stop clock */  	clk_disable(p->clk); -	pm_runtime_put_sync(&p->pdev->dev);  }  static void sh_tmu_set_next(struct sh_tmu_priv *p, unsigned long delta, @@ -415,7 +411,6 @@ static int __devinit sh_tmu_probe(struct platform_device *pdev)  	if (p) {  		dev_info(&pdev->dev, "kept as earlytimer\n"); -		pm_runtime_enable(&pdev->dev);  		return 0;  	} @@ -430,9 +425,6 @@ static int __devinit sh_tmu_probe(struct platform_device *pdev)  		kfree(p);  		platform_set_drvdata(pdev, NULL);  	} - -	if (!is_early_platform_device(pdev)) -		pm_runtime_enable(&pdev->dev);  	return ret;  }  |