diff options
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/irq/autoprobe.c | 15 | ||||
| -rw-r--r-- | kernel/irq/handle.c | 3 | ||||
| -rw-r--r-- | kernel/irq/spurious.c | 5 |
3 files changed, 0 insertions, 23 deletions
diff --git a/kernel/irq/autoprobe.c b/kernel/irq/autoprobe.c index 650ce4102a63..cc0f7321b8ce 100644 --- a/kernel/irq/autoprobe.c +++ b/kernel/irq/autoprobe.c | |||
| @@ -40,9 +40,6 @@ unsigned long probe_irq_on(void) | |||
| 40 | * flush such a longstanding irq before considering it as spurious. | 40 | * flush such a longstanding irq before considering it as spurious. |
| 41 | */ | 41 | */ |
| 42 | for_each_irq_desc_reverse(i, desc) { | 42 | for_each_irq_desc_reverse(i, desc) { |
| 43 | if (!desc) | ||
| 44 | continue; | ||
| 45 | |||
| 46 | spin_lock_irq(&desc->lock); | 43 | spin_lock_irq(&desc->lock); |
| 47 | if (!desc->action && !(desc->status & IRQ_NOPROBE)) { | 44 | if (!desc->action && !(desc->status & IRQ_NOPROBE)) { |
| 48 | /* | 45 | /* |
| @@ -71,9 +68,6 @@ unsigned long probe_irq_on(void) | |||
| 71 | * happened in the previous stage, it may have masked itself) | 68 | * happened in the previous stage, it may have masked itself) |
| 72 | */ | 69 | */ |
| 73 | for_each_irq_desc_reverse(i, desc) { | 70 | for_each_irq_desc_reverse(i, desc) { |
| 74 | if (!desc) | ||
| 75 | continue; | ||
| 76 | |||
| 77 | spin_lock_irq(&desc->lock); | 71 | spin_lock_irq(&desc->lock); |
| 78 | if (!desc->action && !(desc->status & IRQ_NOPROBE)) { | 72 | if (!desc->action && !(desc->status & IRQ_NOPROBE)) { |
| 79 | desc->status |= IRQ_AUTODETECT | IRQ_WAITING; | 73 | desc->status |= IRQ_AUTODETECT | IRQ_WAITING; |
| @@ -92,9 +86,6 @@ unsigned long probe_irq_on(void) | |||
| 92 | * Now filter out any obviously spurious interrupts | 86 | * Now filter out any obviously spurious interrupts |
| 93 | */ | 87 | */ |
| 94 | for_each_irq_desc(i, desc) { | 88 | for_each_irq_desc(i, desc) { |
| 95 | if (!desc) | ||
| 96 | continue; | ||
| 97 | |||
| 98 | spin_lock_irq(&desc->lock); | 89 | spin_lock_irq(&desc->lock); |
| 99 | status = desc->status; | 90 | status = desc->status; |
| 100 | 91 | ||
| @@ -133,9 +124,6 @@ unsigned int probe_irq_mask(unsigned long val) | |||
| 133 | int i; | 124 | int i; |
| 134 | 125 | ||
| 135 | for_each_irq_desc(i, desc) { | 126 | for_each_irq_desc(i, desc) { |
| 136 | if (!desc) | ||
| 137 | continue; | ||
| 138 | |||
| 139 | spin_lock_irq(&desc->lock); | 127 | spin_lock_irq(&desc->lock); |
| 140 | status = desc->status; | 128 | status = desc->status; |
| 141 | 129 | ||
| @@ -178,9 +166,6 @@ int probe_irq_off(unsigned long val) | |||
| 178 | unsigned int status; | 166 | unsigned int status; |
| 179 | 167 | ||
| 180 | for_each_irq_desc(i, desc) { | 168 | for_each_irq_desc(i, desc) { |
| 181 | if (!desc) | ||
| 182 | continue; | ||
| 183 | |||
| 184 | spin_lock_irq(&desc->lock); | 169 | spin_lock_irq(&desc->lock); |
| 185 | status = desc->status; | 170 | status = desc->status; |
| 186 | 171 | ||
diff --git a/kernel/irq/handle.c b/kernel/irq/handle.c index 03479dfdebb8..7dbdfe524693 100644 --- a/kernel/irq/handle.c +++ b/kernel/irq/handle.c | |||
| @@ -437,9 +437,6 @@ void early_init_irq_lock_class(void) | |||
| 437 | int i; | 437 | int i; |
| 438 | 438 | ||
| 439 | for_each_irq_desc(i, desc) { | 439 | for_each_irq_desc(i, desc) { |
| 440 | if (!desc) | ||
| 441 | continue; | ||
| 442 | |||
| 443 | lockdep_set_class(&desc->lock, &irq_desc_lock_class); | 440 | lockdep_set_class(&desc->lock, &irq_desc_lock_class); |
| 444 | } | 441 | } |
| 445 | } | 442 | } |
diff --git a/kernel/irq/spurious.c b/kernel/irq/spurious.c index 3738107531fd..dd364c11e56e 100644 --- a/kernel/irq/spurious.c +++ b/kernel/irq/spurious.c | |||
| @@ -91,9 +91,6 @@ static int misrouted_irq(int irq) | |||
| 91 | int i, ok = 0; | 91 | int i, ok = 0; |
| 92 | 92 | ||
| 93 | for_each_irq_desc(i, desc) { | 93 | for_each_irq_desc(i, desc) { |
| 94 | if (!desc) | ||
| 95 | continue; | ||
| 96 | |||
| 97 | if (!i) | 94 | if (!i) |
| 98 | continue; | 95 | continue; |
| 99 | 96 | ||
| @@ -115,8 +112,6 @@ static void poll_spurious_irqs(unsigned long dummy) | |||
| 115 | for_each_irq_desc(i, desc) { | 112 | for_each_irq_desc(i, desc) { |
| 116 | unsigned int status; | 113 | unsigned int status; |
| 117 | 114 | ||
| 118 | if (!desc) | ||
| 119 | continue; | ||
| 120 | if (!i) | 115 | if (!i) |
| 121 | continue; | 116 | continue; |
| 122 | 117 | ||
