diff options
Diffstat (limited to 'arch/arm/mach-omap2/clockdomain.c')
| -rw-r--r-- | arch/arm/mach-omap2/clockdomain.c | 74 | 
1 files changed, 34 insertions, 40 deletions
diff --git a/arch/arm/mach-omap2/clockdomain.c b/arch/arm/mach-omap2/clockdomain.c index 8664f5a8bfb..a1555627ad9 100644 --- a/arch/arm/mach-omap2/clockdomain.c +++ b/arch/arm/mach-omap2/clockdomain.c @@ -174,9 +174,8 @@ void _clkdm_add_autodeps(struct clockdomain *clkdm)  		if (IS_ERR(autodep->clkdm.ptr))  			continue; -		pr_debug("clockdomain: adding %s sleepdep/wkdep for " -			 "clkdm %s\n", autodep->clkdm.ptr->name, -			 clkdm->name); +		pr_debug("clockdomain: %s: adding %s sleepdep/wkdep\n", +			 clkdm->name, autodep->clkdm.ptr->name);  		clkdm_add_sleepdep(clkdm, autodep->clkdm.ptr);  		clkdm_add_wkdep(clkdm, autodep->clkdm.ptr); @@ -205,9 +204,8 @@ void _clkdm_del_autodeps(struct clockdomain *clkdm)  		if (IS_ERR(autodep->clkdm.ptr))  			continue; -		pr_debug("clockdomain: removing %s sleepdep/wkdep for " -			 "clkdm %s\n", autodep->clkdm.ptr->name, -			 clkdm->name); +		pr_debug("clockdomain: %s: removing %s sleepdep/wkdep\n", +			 clkdm->name, autodep->clkdm.ptr->name);  		clkdm_del_sleepdep(clkdm, autodep->clkdm.ptr);  		clkdm_del_wkdep(clkdm, autodep->clkdm.ptr); @@ -469,14 +467,14 @@ int clkdm_add_wkdep(struct clockdomain *clkdm1, struct clockdomain *clkdm2)  		ret = -EINVAL;  	if (ret) { -		pr_debug("clockdomain: hardware cannot set/clear wake up of " -			 "%s when %s wakes up\n", clkdm1->name, clkdm2->name); +		pr_debug("clockdomain: hardware cannot set/clear wake up of %s when %s wakes up\n", +			 clkdm1->name, clkdm2->name);  		return ret;  	}  	if (atomic_inc_return(&cd->wkdep_usecount) == 1) { -		pr_debug("clockdomain: hardware will wake up %s when %s wakes " -			 "up\n", clkdm1->name, clkdm2->name); +		pr_debug("clockdomain: hardware will wake up %s when %s wakes up\n", +			 clkdm1->name, clkdm2->name);  		ret = arch_clkdm->clkdm_add_wkdep(clkdm1, clkdm2);  	} @@ -510,14 +508,14 @@ int clkdm_del_wkdep(struct clockdomain *clkdm1, struct clockdomain *clkdm2)  		ret = -EINVAL;  	if (ret) { -		pr_debug("clockdomain: hardware cannot set/clear wake up of " -			 "%s when %s wakes up\n", clkdm1->name, clkdm2->name); +		pr_debug("clockdomain: hardware cannot set/clear wake up of %s when %s wakes up\n", +			 clkdm1->name, clkdm2->name);  		return ret;  	}  	if (atomic_dec_return(&cd->wkdep_usecount) == 0) { -		pr_debug("clockdomain: hardware will no longer wake up %s " -			 "after %s wakes up\n", clkdm1->name, clkdm2->name); +		pr_debug("clockdomain: hardware will no longer wake up %s after %s wakes up\n", +			 clkdm1->name, clkdm2->name);  		ret = arch_clkdm->clkdm_del_wkdep(clkdm1, clkdm2);  	} @@ -555,8 +553,8 @@ int clkdm_read_wkdep(struct clockdomain *clkdm1, struct clockdomain *clkdm2)  		ret = -EINVAL;  	if (ret) { -		pr_debug("clockdomain: hardware cannot set/clear wake up of " -			 "%s when %s wakes up\n", clkdm1->name, clkdm2->name); +		pr_debug("clockdomain: hardware cannot set/clear wake up of %s when %s wakes up\n", +			 clkdm1->name, clkdm2->name);  		return ret;  	} @@ -613,15 +611,14 @@ int clkdm_add_sleepdep(struct clockdomain *clkdm1, struct clockdomain *clkdm2)  		ret = -EINVAL;  	if (ret) { -		pr_debug("clockdomain: hardware cannot set/clear sleep " -			 "dependency affecting %s from %s\n", clkdm1->name, -			 clkdm2->name); +		pr_debug("clockdomain: hardware cannot set/clear sleep dependency affecting %s from %s\n", +			 clkdm1->name, clkdm2->name);  		return ret;  	}  	if (atomic_inc_return(&cd->sleepdep_usecount) == 1) { -		pr_debug("clockdomain: will prevent %s from sleeping if %s " -			 "is active\n", clkdm1->name, clkdm2->name); +		pr_debug("clockdomain: will prevent %s from sleeping if %s is active\n", +			 clkdm1->name, clkdm2->name);  		ret = arch_clkdm->clkdm_add_sleepdep(clkdm1, clkdm2);  	} @@ -657,16 +654,14 @@ int clkdm_del_sleepdep(struct clockdomain *clkdm1, struct clockdomain *clkdm2)  		ret = -EINVAL;  	if (ret) { -		pr_debug("clockdomain: hardware cannot set/clear sleep " -			 "dependency affecting %s from %s\n", clkdm1->name, -			 clkdm2->name); +		pr_debug("clockdomain: hardware cannot set/clear sleep dependency affecting %s from %s\n", +			 clkdm1->name, clkdm2->name);  		return ret;  	}  	if (atomic_dec_return(&cd->sleepdep_usecount) == 0) { -		pr_debug("clockdomain: will no longer prevent %s from " -			 "sleeping if %s is active\n", clkdm1->name, -			 clkdm2->name); +		pr_debug("clockdomain: will no longer prevent %s from sleeping if %s is active\n", +			 clkdm1->name, clkdm2->name);  		ret = arch_clkdm->clkdm_del_sleepdep(clkdm1, clkdm2);  	} @@ -706,9 +701,8 @@ int clkdm_read_sleepdep(struct clockdomain *clkdm1, struct clockdomain *clkdm2)  		ret = -EINVAL;  	if (ret) { -		pr_debug("clockdomain: hardware cannot set/clear sleep " -			 "dependency affecting %s from %s\n", clkdm1->name, -			 clkdm2->name); +		pr_debug("clockdomain: hardware cannot set/clear sleep dependency affecting %s from %s\n", +			 clkdm1->name, clkdm2->name);  		return ret;  	} @@ -755,8 +749,8 @@ int clkdm_sleep(struct clockdomain *clkdm)  		return -EINVAL;  	if (!(clkdm->flags & CLKDM_CAN_FORCE_SLEEP)) { -		pr_debug("clockdomain: %s does not support forcing " -			 "sleep via software\n", clkdm->name); +		pr_debug("clockdomain: %s does not support forcing sleep via software\n", +			 clkdm->name);  		return -EINVAL;  	} @@ -790,8 +784,8 @@ int clkdm_wakeup(struct clockdomain *clkdm)  		return -EINVAL;  	if (!(clkdm->flags & CLKDM_CAN_FORCE_WAKEUP)) { -		pr_debug("clockdomain: %s does not support forcing " -			 "wakeup via software\n", clkdm->name); +		pr_debug("clockdomain: %s does not support forcing wakeup via software\n", +			 clkdm->name);  		return -EINVAL;  	} @@ -826,8 +820,8 @@ void clkdm_allow_idle(struct clockdomain *clkdm)  		return;  	if (!(clkdm->flags & CLKDM_CAN_ENABLE_AUTO)) { -		pr_debug("clock: automatic idle transitions cannot be enabled " -			 "on clockdomain %s\n", clkdm->name); +		pr_debug("clock: %s: automatic idle transitions cannot be enabled\n", +			 clkdm->name);  		return;  	} @@ -861,8 +855,8 @@ void clkdm_deny_idle(struct clockdomain *clkdm)  		return;  	if (!(clkdm->flags & CLKDM_CAN_DISABLE_AUTO)) { -		pr_debug("clockdomain: automatic idle transitions cannot be " -			 "disabled on %s\n", clkdm->name); +		pr_debug("clockdomain: %s: automatic idle transitions cannot be disabled\n", +			 clkdm->name);  		return;  	} @@ -927,7 +921,7 @@ static int _clkdm_clk_hwmod_enable(struct clockdomain *clkdm)  	pwrdm_state_switch(clkdm->pwrdm.ptr);  	spin_unlock_irqrestore(&clkdm->lock, flags); -	pr_debug("clockdomain: clkdm %s: enabled\n", clkdm->name); +	pr_debug("clockdomain: %s: enabled\n", clkdm->name);  	return 0;  } @@ -952,7 +946,7 @@ static int _clkdm_clk_hwmod_disable(struct clockdomain *clkdm)  	pwrdm_state_switch(clkdm->pwrdm.ptr);  	spin_unlock_irqrestore(&clkdm->lock, flags); -	pr_debug("clockdomain: clkdm %s: disabled\n", clkdm->name); +	pr_debug("clockdomain: %s: disabled\n", clkdm->name);  	return 0;  }  |