diff options
Diffstat (limited to 'arch/arm/mach-omap2/cm3xxx.c')
| -rw-r--r-- | arch/arm/mach-omap2/cm3xxx.c | 14 | 
1 files changed, 7 insertions, 7 deletions
diff --git a/arch/arm/mach-omap2/cm3xxx.c b/arch/arm/mach-omap2/cm3xxx.c index c2086f2e86b..9061c307d91 100644 --- a/arch/arm/mach-omap2/cm3xxx.c +++ b/arch/arm/mach-omap2/cm3xxx.c @@ -186,7 +186,7 @@ static int omap3xxx_clkdm_clear_all_sleepdeps(struct clockdomain *clkdm)  			continue; /* only happens if data is erroneous */  		mask |= 1 << cd->clkdm->dep_bit; -		atomic_set(&cd->sleepdep_usecount, 0); +		cd->sleepdep_usecount = 0;  	}  	omap2_cm_clear_mod_reg_bits(mask, clkdm->pwrdm.ptr->prcm_offs,  				    OMAP3430_CM_SLEEPDEP); @@ -209,8 +209,8 @@ static int omap3xxx_clkdm_wakeup(struct clockdomain *clkdm)  static void omap3xxx_clkdm_allow_idle(struct clockdomain *clkdm)  { -	if (atomic_read(&clkdm->usecount) > 0) -		_clkdm_add_autodeps(clkdm); +	if (clkdm->usecount > 0) +		clkdm_add_autodeps(clkdm);  	omap3xxx_cm_clkdm_enable_hwsup(clkdm->pwrdm.ptr->prcm_offs,  				       clkdm->clktrctrl_mask); @@ -221,8 +221,8 @@ static void omap3xxx_clkdm_deny_idle(struct clockdomain *clkdm)  	omap3xxx_cm_clkdm_disable_hwsup(clkdm->pwrdm.ptr->prcm_offs,  					clkdm->clktrctrl_mask); -	if (atomic_read(&clkdm->usecount) > 0) -		_clkdm_del_autodeps(clkdm); +	if (clkdm->usecount > 0) +		clkdm_del_autodeps(clkdm);  }  static int omap3xxx_clkdm_clk_enable(struct clockdomain *clkdm) @@ -250,7 +250,7 @@ static int omap3xxx_clkdm_clk_enable(struct clockdomain *clkdm)  		/* Disable HW transitions when we are changing deps */  		omap3xxx_cm_clkdm_disable_hwsup(clkdm->pwrdm.ptr->prcm_offs,  						clkdm->clktrctrl_mask); -		_clkdm_add_autodeps(clkdm); +		clkdm_add_autodeps(clkdm);  		omap3xxx_cm_clkdm_enable_hwsup(clkdm->pwrdm.ptr->prcm_offs,  					       clkdm->clktrctrl_mask);  	} else { @@ -287,7 +287,7 @@ static int omap3xxx_clkdm_clk_disable(struct clockdomain *clkdm)  		/* Disable HW transitions when we are changing deps */  		omap3xxx_cm_clkdm_disable_hwsup(clkdm->pwrdm.ptr->prcm_offs,  						clkdm->clktrctrl_mask); -		_clkdm_del_autodeps(clkdm); +		clkdm_del_autodeps(clkdm);  		omap3xxx_cm_clkdm_enable_hwsup(clkdm->pwrdm.ptr->prcm_offs,  					       clkdm->clktrctrl_mask);  	} else {  |