UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'regulator/fix/dbx500' into regulator-linus

This commit is contained in:
Mark Brown 2013-05-30 11:58:37 +01:00
parent 435494acd6 3d75095a53
commit e4bf063cb8
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
drivers/regulator/dbx500-prcmu.c
View File

@ -24,18 +24,6 @@
static int power_state_active_cnt; /* will initialize to zero */ static int power_state_active_cnt; /* will initialize to zero */
static DEFINE_SPINLOCK(power_state_active_lock); static DEFINE_SPINLOCK(power_state_active_lock);
int power_state_active_get(void)
{
unsigned long flags;
int cnt;
spin_lock_irqsave(&power_state_active_lock, flags);
cnt = power_state_active_cnt;
spin_unlock_irqrestore(&power_state_active_lock, flags);
return cnt;
}
void power_state_active_enable(void) void power_state_active_enable(void)
{ {
unsigned long flags; unsigned long flags;
@ -65,6 +53,18 @@ out:
#ifdef CONFIG_REGULATOR_DEBUG #ifdef CONFIG_REGULATOR_DEBUG
static int power_state_active_get(void)
{
unsigned long flags;
int cnt;
spin_lock_irqsave(&power_state_active_lock, flags);
cnt = power_state_active_cnt;
spin_unlock_irqrestore(&power_state_active_lock, flags);
return cnt;
}
static struct ux500_regulator_debug { static struct ux500_regulator_debug {
struct dentry *dir; struct dentry *dir;
struct dentry *status_file; struct dentry *status_file;