diff options
Diffstat (limited to 'arch/arm/mach-omap2/omap_hwmod.c')
| -rw-r--r-- | arch/arm/mach-omap2/omap_hwmod.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c index f22b4dea0aa..fcb83862069 100644 --- a/arch/arm/mach-omap2/omap_hwmod.c +++ b/arch/arm/mach-omap2/omap_hwmod.c @@ -3573,7 +3573,7 @@ int omap_hwmod_enable(struct omap_hwmod *oh) if (!oh) return -EINVAL; - spin_lock_irqsave(&oh->_lock, flags); + spin_lock_irqsave_nested(&oh->_lock, flags, (int)oh); r = _enable(oh); spin_unlock_irqrestore(&oh->_lock, flags); @@ -3594,7 +3594,7 @@ int omap_hwmod_idle(struct omap_hwmod *oh) if (!oh) return -EINVAL; - spin_lock_irqsave(&oh->_lock, flags); + spin_lock_irqsave_nested(&oh->_lock, flags, (int)oh); _idle(oh); spin_unlock_irqrestore(&oh->_lock, flags); @@ -3616,7 +3616,7 @@ int omap_hwmod_shutdown(struct omap_hwmod *oh) if (!oh) return -EINVAL; - spin_lock_irqsave(&oh->_lock, flags); + spin_lock_irqsave_nested(&oh->_lock, flags, (int)oh); _shutdown(oh); spin_unlock_irqrestore(&oh->_lock, flags); @@ -3633,7 +3633,7 @@ int omap_hwmod_enable_clocks(struct omap_hwmod *oh) { unsigned long flags; - spin_lock_irqsave(&oh->_lock, flags); + spin_lock_irqsave_nested(&oh->_lock, flags, (int)oh); _enable_clocks(oh); spin_unlock_irqrestore(&oh->_lock, flags); @@ -3650,7 +3650,7 @@ int omap_hwmod_disable_clocks(struct omap_hwmod *oh) { unsigned long flags; - spin_lock_irqsave(&oh->_lock, flags); + spin_lock_irqsave_nested(&oh->_lock, flags, (int)oh); _disable_clocks(oh); spin_unlock_irqrestore(&oh->_lock, flags); @@ -3701,7 +3701,7 @@ int omap_hwmod_reset(struct omap_hwmod *oh) if (!oh) return -EINVAL; - spin_lock_irqsave(&oh->_lock, flags); + spin_lock_irqsave_nested(&oh->_lock, flags, (int)oh); r = _reset(oh); spin_unlock_irqrestore(&oh->_lock, flags); @@ -4025,7 +4025,7 @@ int omap_hwmod_enable_wakeup(struct omap_hwmod *oh) unsigned long flags; u32 v; - spin_lock_irqsave(&oh->_lock, flags); + spin_lock_irqsave_nested(&oh->_lock, flags, (int)oh); if (oh->class->sysc && (oh->class->sysc->sysc_flags & SYSC_HAS_ENAWAKEUP)) { @@ -4058,7 +4058,7 @@ int omap_hwmod_disable_wakeup(struct omap_hwmod *oh) unsigned long flags; u32 v; - spin_lock_irqsave(&oh->_lock, flags); + spin_lock_irqsave_nested(&oh->_lock, flags, (int)oh); if (oh->class->sysc && (oh->class->sysc->sysc_flags & SYSC_HAS_ENAWAKEUP)) { @@ -4093,7 +4093,7 @@ int omap_hwmod_assert_hardreset(struct omap_hwmod *oh, const char *name) if (!oh) return -EINVAL; - spin_lock_irqsave(&oh->_lock, flags); + spin_lock_irqsave_nested(&oh->_lock, flags, (int)oh); ret = _assert_hardreset(oh, name); spin_unlock_irqrestore(&oh->_lock, flags); @@ -4120,7 +4120,7 @@ int omap_hwmod_deassert_hardreset(struct omap_hwmod *oh, const char *name) if (!oh) return -EINVAL; - spin_lock_irqsave(&oh->_lock, flags); + spin_lock_irqsave_nested(&oh->_lock, flags, (int)oh); ret = _deassert_hardreset(oh, name); spin_unlock_irqrestore(&oh->_lock, flags); @@ -4146,7 +4146,7 @@ int omap_hwmod_read_hardreset(struct omap_hwmod *oh, const char *name) if (!oh) return -EINVAL; - spin_lock_irqsave(&oh->_lock, flags); + spin_lock_irqsave_nested(&oh->_lock, flags, (int)oh); ret = _read_hardreset(oh, name); spin_unlock_irqrestore(&oh->_lock, flags); @@ -4221,7 +4221,7 @@ int omap_hwmod_set_postsetup_state(struct omap_hwmod *oh, u8 state) state != _HWMOD_STATE_IDLE) return -EINVAL; - spin_lock_irqsave(&oh->_lock, flags); + spin_lock_irqsave_nested(&oh->_lock, flags, (int)oh); if (oh->_state != _HWMOD_STATE_REGISTERED) { ret = -EINVAL; |