diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2005-10-03 08:41:19 -0400 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2005-10-29 14:32:35 -0400 |
commit | 2f69ddccb01632dfe5d0ef946ee99000463cd9c4 (patch) | |
tree | 92a4e77e077718d08c6733f7abe604ca0c132042 | |
parent | 57468af3267bfb89391f9c607a9637e86e55d299 (diff) |
Convert the remaining SPIN_LOCK_UNLOCKED instances to DEFINE_SPINLOCK.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
-rw-r--r-- | arch/mips/au1000/common/dbdma.c | 2 | ||||
-rw-r--r-- | arch/mips/pci/ops-nile4.c | 2 | ||||
-rw-r--r-- | arch/mips/pmc-sierra/yosemite/smp.c | 2 | ||||
-rw-r--r-- | arch/mips/vr41xx/common/cmu.c | 2 | ||||
-rw-r--r-- | arch/mips/vr41xx/common/vrc4173.c | 4 |
5 files changed, 6 insertions, 6 deletions
diff --git a/arch/mips/au1000/common/dbdma.c b/arch/mips/au1000/common/dbdma.c index 80d241b9c6f4..a5a6709637e0 100644 --- a/arch/mips/au1000/common/dbdma.c +++ b/arch/mips/au1000/common/dbdma.c | |||
@@ -58,7 +58,7 @@ | |||
58 | * functions. The drivers allocate the data buffers and assign them | 58 | * functions. The drivers allocate the data buffers and assign them |
59 | * to the descriptors. | 59 | * to the descriptors. |
60 | */ | 60 | */ |
61 | static spinlock_t au1xxx_dbdma_spin_lock = SPIN_LOCK_UNLOCKED; | 61 | static DEFINE_SPINLOCK(au1xxx_dbdma_spin_lock); |
62 | 62 | ||
63 | /* I couldn't find a macro that did this...... | 63 | /* I couldn't find a macro that did this...... |
64 | */ | 64 | */ |
diff --git a/arch/mips/pci/ops-nile4.c b/arch/mips/pci/ops-nile4.c index a7169928b351..a8d38dc8c504 100644 --- a/arch/mips/pci/ops-nile4.c +++ b/arch/mips/pci/ops-nile4.c | |||
@@ -15,7 +15,7 @@ | |||
15 | 15 | ||
16 | volatile unsigned long *const vrc_pciregs = (void *) Vrc5074_BASE; | 16 | volatile unsigned long *const vrc_pciregs = (void *) Vrc5074_BASE; |
17 | 17 | ||
18 | static spinlock_t nile4_pci_lock; | 18 | static DEFINE_SPINLOCK(nile4_pci_lock); |
19 | 19 | ||
20 | static int nile4_pcibios_config_access(unsigned char access_type, | 20 | static int nile4_pcibios_config_access(unsigned char access_type, |
21 | struct pci_bus *bus, unsigned int devfn, int where, u32 * val) | 21 | struct pci_bus *bus, unsigned int devfn, int where, u32 * val) |
diff --git a/arch/mips/pmc-sierra/yosemite/smp.c b/arch/mips/pmc-sierra/yosemite/smp.c index 1d3b0734c78c..0527170d6adb 100644 --- a/arch/mips/pmc-sierra/yosemite/smp.c +++ b/arch/mips/pmc-sierra/yosemite/smp.c | |||
@@ -9,7 +9,7 @@ extern void (*mips_hpt_init)(unsigned int); | |||
9 | 9 | ||
10 | #define LAUNCHSTACK_SIZE 256 | 10 | #define LAUNCHSTACK_SIZE 256 |
11 | 11 | ||
12 | static spinlock_t launch_lock __initdata; | 12 | static __initdata DEFINE_SPINLOCK(launch_lock); |
13 | 13 | ||
14 | static unsigned long secondary_sp __initdata; | 14 | static unsigned long secondary_sp __initdata; |
15 | static unsigned long secondary_gp __initdata; | 15 | static unsigned long secondary_gp __initdata; |
diff --git a/arch/mips/vr41xx/common/cmu.c b/arch/mips/vr41xx/common/cmu.c index fcd3cb8cdd9d..d758e432961b 100644 --- a/arch/mips/vr41xx/common/cmu.c +++ b/arch/mips/vr41xx/common/cmu.c | |||
@@ -69,7 +69,7 @@ | |||
69 | 69 | ||
70 | static void __iomem *cmu_base; | 70 | static void __iomem *cmu_base; |
71 | static uint16_t cmuclkmsk, cmuclkmsk2; | 71 | static uint16_t cmuclkmsk, cmuclkmsk2; |
72 | static spinlock_t cmu_lock; | 72 | static DEFINE_SPINLOCK(cmu_lock); |
73 | 73 | ||
74 | #define cmu_read(offset) readw(cmu_base + (offset)) | 74 | #define cmu_read(offset) readw(cmu_base + (offset)) |
75 | #define cmu_write(offset, value) writew((value), cmu_base + (offset)) | 75 | #define cmu_write(offset, value) writew((value), cmu_base + (offset)) |
diff --git a/arch/mips/vr41xx/common/vrc4173.c b/arch/mips/vr41xx/common/vrc4173.c index ba58764ef8ea..462a9af30eef 100644 --- a/arch/mips/vr41xx/common/vrc4173.c +++ b/arch/mips/vr41xx/common/vrc4173.c | |||
@@ -81,8 +81,8 @@ EXPORT_SYMBOL(vrc4173_io_offset); | |||
81 | static int vrc4173_initialized; | 81 | static int vrc4173_initialized; |
82 | static uint16_t vrc4173_cmuclkmsk; | 82 | static uint16_t vrc4173_cmuclkmsk; |
83 | static uint16_t vrc4173_selectreg; | 83 | static uint16_t vrc4173_selectreg; |
84 | static spinlock_t vrc4173_cmu_lock; | 84 | static DEFINE_SPINLOCK(vrc4173_cmu_lock); |
85 | static spinlock_t vrc4173_giu_lock; | 85 | static DEFINE_SPINLOCK(vrc4173_giu_lock); |
86 | 86 | ||
87 | static inline void set_cmusrst(uint16_t val) | 87 | static inline void set_cmusrst(uint16_t val) |
88 | { | 88 | { |