diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-05-30 11:58:37 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-05-30 11:58:37 +0100 |
| commit | e4bf063cb8b5e3648aa9917692b185068ab8ba23 (patch) | |
| tree | 665677c1f954b01742efcf096ca1ea14cb797f11 /drivers/regulator | |
| parent | 435494acd6d4b3b7300191dd8af3163782ab30b5 (diff) | |
| parent | 3d75095a533aa3bbad652369ffde4c129781b8ec (diff) | |
| download | blackbird-op-linux-e4bf063cb8b5e3648aa9917692b185068ab8ba23.tar.gz blackbird-op-linux-e4bf063cb8b5e3648aa9917692b185068ab8ba23.zip | |
Merge remote-tracking branch 'regulator/fix/dbx500' into regulator-linus
Diffstat (limited to 'drivers/regulator')
| -rw-r--r-- | drivers/regulator/dbx500-prcmu.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/drivers/regulator/dbx500-prcmu.c b/drivers/regulator/dbx500-prcmu.c index 89bd2faaef8c..ce89f7848a57 100644 --- a/drivers/regulator/dbx500-prcmu.c +++ b/drivers/regulator/dbx500-prcmu.c @@ -24,18 +24,6 @@ static int power_state_active_cnt; /* will initialize to zero */ 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) { unsigned long flags; @@ -65,6 +53,18 @@ out: #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 { struct dentry *dir; struct dentry *status_file; |
