Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e4bf063c authored by Mark Brown's avatar Mark Brown
Browse files

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

parents 435494ac 3d75095a

drivers/regulator/dbx500-prcmu.c

+12 −12
Original line number Original line Diff line number Diff line
@@ -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 @@ int power_state_active_disable(void) 




#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;