diff options
Diffstat (limited to 'kernel/irq/autoprobe.c')
-rw-r--r-- | kernel/irq/autoprobe.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/kernel/irq/autoprobe.c b/kernel/irq/autoprobe.c index 1de9700f416e..2295a31ef110 100644 --- a/kernel/irq/autoprobe.c +++ b/kernel/irq/autoprobe.c | |||
@@ -45,7 +45,7 @@ unsigned long probe_irq_on(void) | |||
45 | * flush such a longstanding irq before considering it as spurious. | 45 | * flush such a longstanding irq before considering it as spurious. |
46 | */ | 46 | */ |
47 | for_each_irq_desc_reverse(i, desc) { | 47 | for_each_irq_desc_reverse(i, desc) { |
48 | spin_lock_irq(&desc->lock); | 48 | raw_spin_lock_irq(&desc->lock); |
49 | if (!desc->action && !(desc->status & IRQ_NOPROBE)) { | 49 | if (!desc->action && !(desc->status & IRQ_NOPROBE)) { |
50 | /* | 50 | /* |
51 | * An old-style architecture might still have | 51 | * An old-style architecture might still have |
@@ -61,7 +61,7 @@ unsigned long probe_irq_on(void) | |||
61 | desc->chip->set_type(i, IRQ_TYPE_PROBE); | 61 | desc->chip->set_type(i, IRQ_TYPE_PROBE); |
62 | desc->chip->startup(i); | 62 | desc->chip->startup(i); |
63 | } | 63 | } |
64 | spin_unlock_irq(&desc->lock); | 64 | raw_spin_unlock_irq(&desc->lock); |
65 | } | 65 | } |
66 | 66 | ||
67 | /* Wait for longstanding interrupts to trigger. */ | 67 | /* Wait for longstanding interrupts to trigger. */ |
@@ -73,13 +73,13 @@ unsigned long probe_irq_on(void) | |||
73 | * happened in the previous stage, it may have masked itself) | 73 | * happened in the previous stage, it may have masked itself) |
74 | */ | 74 | */ |
75 | for_each_irq_desc_reverse(i, desc) { | 75 | for_each_irq_desc_reverse(i, desc) { |
76 | spin_lock_irq(&desc->lock); | 76 | raw_spin_lock_irq(&desc->lock); |
77 | if (!desc->action && !(desc->status & IRQ_NOPROBE)) { | 77 | if (!desc->action && !(desc->status & IRQ_NOPROBE)) { |
78 | desc->status |= IRQ_AUTODETECT | IRQ_WAITING; | 78 | desc->status |= IRQ_AUTODETECT | IRQ_WAITING; |
79 | if (desc->chip->startup(i)) | 79 | if (desc->chip->startup(i)) |
80 | desc->status |= IRQ_PENDING; | 80 | desc->status |= IRQ_PENDING; |
81 | } | 81 | } |
82 | spin_unlock_irq(&desc->lock); | 82 | raw_spin_unlock_irq(&desc->lock); |
83 | } | 83 | } |
84 | 84 | ||
85 | /* | 85 | /* |
@@ -91,7 +91,7 @@ unsigned long probe_irq_on(void) | |||
91 | * Now filter out any obviously spurious interrupts | 91 | * Now filter out any obviously spurious interrupts |
92 | */ | 92 | */ |
93 | for_each_irq_desc(i, desc) { | 93 | for_each_irq_desc(i, desc) { |
94 | spin_lock_irq(&desc->lock); | 94 | raw_spin_lock_irq(&desc->lock); |
95 | status = desc->status; | 95 | status = desc->status; |
96 | 96 | ||
97 | if (status & IRQ_AUTODETECT) { | 97 | if (status & IRQ_AUTODETECT) { |
@@ -103,7 +103,7 @@ unsigned long probe_irq_on(void) | |||
103 | if (i < 32) | 103 | if (i < 32) |
104 | mask |= 1 << i; | 104 | mask |= 1 << i; |
105 | } | 105 | } |
106 | spin_unlock_irq(&desc->lock); | 106 | raw_spin_unlock_irq(&desc->lock); |
107 | } | 107 | } |
108 | 108 | ||
109 | return mask; | 109 | return mask; |
@@ -129,7 +129,7 @@ unsigned int probe_irq_mask(unsigned long val) | |||
129 | int i; | 129 | int i; |
130 | 130 | ||
131 | for_each_irq_desc(i, desc) { | 131 | for_each_irq_desc(i, desc) { |
132 | spin_lock_irq(&desc->lock); | 132 | raw_spin_lock_irq(&desc->lock); |
133 | status = desc->status; | 133 | status = desc->status; |
134 | 134 | ||
135 | if (status & IRQ_AUTODETECT) { | 135 | if (status & IRQ_AUTODETECT) { |
@@ -139,7 +139,7 @@ unsigned int probe_irq_mask(unsigned long val) | |||
139 | desc->status = status & ~IRQ_AUTODETECT; | 139 | desc->status = status & ~IRQ_AUTODETECT; |
140 | desc->chip->shutdown(i); | 140 | desc->chip->shutdown(i); |
141 | } | 141 | } |
142 | spin_unlock_irq(&desc->lock); | 142 | raw_spin_unlock_irq(&desc->lock); |
143 | } | 143 | } |
144 | mutex_unlock(&probing_active); | 144 | mutex_unlock(&probing_active); |
145 | 145 | ||
@@ -171,7 +171,7 @@ int probe_irq_off(unsigned long val) | |||
171 | unsigned int status; | 171 | unsigned int status; |
172 | 172 | ||
173 | for_each_irq_desc(i, desc) { | 173 | for_each_irq_desc(i, desc) { |
174 | spin_lock_irq(&desc->lock); | 174 | raw_spin_lock_irq(&desc->lock); |
175 | status = desc->status; | 175 | status = desc->status; |
176 | 176 | ||
177 | if (status & IRQ_AUTODETECT) { | 177 | if (status & IRQ_AUTODETECT) { |
@@ -183,7 +183,7 @@ int probe_irq_off(unsigned long val) | |||
183 | desc->status = status & ~IRQ_AUTODETECT; | 183 | desc->status = status & ~IRQ_AUTODETECT; |
184 | desc->chip->shutdown(i); | 184 | desc->chip->shutdown(i); |
185 | } | 185 | } |
186 | spin_unlock_irq(&desc->lock); | 186 | raw_spin_unlock_irq(&desc->lock); |
187 | } | 187 | } |
188 | mutex_unlock(&probing_active); | 188 | mutex_unlock(&probing_active); |
189 | 189 | ||