diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2007-05-11 01:33:04 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2007-05-11 12:38:04 -0400 |
commit | 87b247c41674e29f90bf4938799ab079951ccc6b (patch) | |
tree | a64d91af3f6c2423629da2799da1e2382dc7a5f9 /arch | |
parent | a0d6333742c68b321043e4982ec413951ee9afb0 (diff) |
[ARM] Spinlock initializer cleanup
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/kernel/time.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-omap2/gpmc.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-pnx4008/dma.c | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/kernel/time.c b/arch/arm/kernel/time.c index d0540e4eaf5b..1533d3ecd7a0 100644 --- a/arch/arm/kernel/time.c +++ b/arch/arm/kernel/time.c | |||
@@ -512,7 +512,7 @@ void __init time_init(void) | |||
512 | 512 | ||
513 | #ifdef CONFIG_NO_IDLE_HZ | 513 | #ifdef CONFIG_NO_IDLE_HZ |
514 | if (system_timer->dyn_tick) | 514 | if (system_timer->dyn_tick) |
515 | system_timer->dyn_tick->lock = SPIN_LOCK_UNLOCKED; | 515 | spin_lock_init(&system_timer->dyn_tick->lock); |
516 | #endif | 516 | #endif |
517 | } | 517 | } |
518 | 518 | ||
diff --git a/arch/arm/mach-omap2/gpmc.c b/arch/arm/mach-omap2/gpmc.c index 54c836a98456..e290b989aa94 100644 --- a/arch/arm/mach-omap2/gpmc.c +++ b/arch/arm/mach-omap2/gpmc.c | |||
@@ -54,7 +54,7 @@ | |||
54 | 54 | ||
55 | static struct resource gpmc_mem_root; | 55 | static struct resource gpmc_mem_root; |
56 | static struct resource gpmc_cs_mem[GPMC_CS_NUM]; | 56 | static struct resource gpmc_cs_mem[GPMC_CS_NUM]; |
57 | static spinlock_t gpmc_mem_lock = SPIN_LOCK_UNLOCKED; | 57 | static DEFINE_SPINLOCK(gpmc_mem_lock); |
58 | static unsigned gpmc_cs_map; | 58 | static unsigned gpmc_cs_map; |
59 | 59 | ||
60 | static void __iomem *gpmc_base = | 60 | static void __iomem *gpmc_base = |
diff --git a/arch/arm/mach-pnx4008/dma.c b/arch/arm/mach-pnx4008/dma.c index d6a279e4b524..f7009d845be8 100644 --- a/arch/arm/mach-pnx4008/dma.c +++ b/arch/arm/mach-pnx4008/dma.c | |||
@@ -47,7 +47,7 @@ static struct ll_pool { | |||
47 | int count; | 47 | int count; |
48 | } ll_pool; | 48 | } ll_pool; |
49 | 49 | ||
50 | static spinlock_t ll_lock = SPIN_LOCK_UNLOCKED; | 50 | static DEFINE_SPINLOCK(ll_lock); |
51 | 51 | ||
52 | struct pnx4008_dma_ll *pnx4008_alloc_ll_entry(dma_addr_t * ll_dma) | 52 | struct pnx4008_dma_ll *pnx4008_alloc_ll_entry(dma_addr_t * ll_dma) |
53 | { | 53 | { |
@@ -135,7 +135,7 @@ static inline void dma_decrement_usage(void) | |||
135 | } | 135 | } |
136 | } | 136 | } |
137 | 137 | ||
138 | static spinlock_t dma_lock = SPIN_LOCK_UNLOCKED; | 138 | static DEFINE_SPINLOCK(dma_lock); |
139 | 139 | ||
140 | static inline void pnx4008_dma_lock(void) | 140 | static inline void pnx4008_dma_lock(void) |
141 | { | 141 | { |