diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2010-10-01 06:58:38 -0400 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2010-10-04 06:36:26 -0400 |
commit | 6b8ff3120c758340505dddf08ad685ebb841d5d5 (patch) | |
tree | 794eed27c6f9a8931b8fdf4a7ae60a1560b237fc /kernel/irq/autoprobe.c | |
parent | ff7dcd44dd446db2c3e13bdedf2d52b8e0127f16 (diff) |
genirq: Convert core code to irq_data
Convert all references in the core code to orq, chip, handler_data,
chip_data, msi_desc, affinity to irq_data.*
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Reviewed-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel/irq/autoprobe.c')
-rw-r--r-- | kernel/irq/autoprobe.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/kernel/irq/autoprobe.c b/kernel/irq/autoprobe.c index 2295a31ef110..f9bf9b228033 100644 --- a/kernel/irq/autoprobe.c +++ b/kernel/irq/autoprobe.c | |||
@@ -57,9 +57,9 @@ unsigned long probe_irq_on(void) | |||
57 | * Some chips need to know about probing in | 57 | * Some chips need to know about probing in |
58 | * progress: | 58 | * progress: |
59 | */ | 59 | */ |
60 | if (desc->chip->set_type) | 60 | if (desc->irq_data.chip->set_type) |
61 | desc->chip->set_type(i, IRQ_TYPE_PROBE); | 61 | desc->irq_data.chip->set_type(i, IRQ_TYPE_PROBE); |
62 | desc->chip->startup(i); | 62 | desc->irq_data.chip->startup(i); |
63 | } | 63 | } |
64 | raw_spin_unlock_irq(&desc->lock); | 64 | raw_spin_unlock_irq(&desc->lock); |
65 | } | 65 | } |
@@ -76,7 +76,7 @@ unsigned long probe_irq_on(void) | |||
76 | raw_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->irq_data.chip->startup(i)) |
80 | desc->status |= IRQ_PENDING; | 80 | desc->status |= IRQ_PENDING; |
81 | } | 81 | } |
82 | raw_spin_unlock_irq(&desc->lock); | 82 | raw_spin_unlock_irq(&desc->lock); |
@@ -98,7 +98,7 @@ unsigned long probe_irq_on(void) | |||
98 | /* It triggered already - consider it spurious. */ | 98 | /* It triggered already - consider it spurious. */ |
99 | if (!(status & IRQ_WAITING)) { | 99 | if (!(status & IRQ_WAITING)) { |
100 | desc->status = status & ~IRQ_AUTODETECT; | 100 | desc->status = status & ~IRQ_AUTODETECT; |
101 | desc->chip->shutdown(i); | 101 | desc->irq_data.chip->shutdown(i); |
102 | } else | 102 | } else |
103 | if (i < 32) | 103 | if (i < 32) |
104 | mask |= 1 << i; | 104 | mask |= 1 << i; |
@@ -137,7 +137,7 @@ unsigned int probe_irq_mask(unsigned long val) | |||
137 | mask |= 1 << i; | 137 | mask |= 1 << i; |
138 | 138 | ||
139 | desc->status = status & ~IRQ_AUTODETECT; | 139 | desc->status = status & ~IRQ_AUTODETECT; |
140 | desc->chip->shutdown(i); | 140 | desc->irq_data.chip->shutdown(i); |
141 | } | 141 | } |
142 | raw_spin_unlock_irq(&desc->lock); | 142 | raw_spin_unlock_irq(&desc->lock); |
143 | } | 143 | } |
@@ -181,7 +181,7 @@ int probe_irq_off(unsigned long val) | |||
181 | nr_of_irqs++; | 181 | nr_of_irqs++; |
182 | } | 182 | } |
183 | desc->status = status & ~IRQ_AUTODETECT; | 183 | desc->status = status & ~IRQ_AUTODETECT; |
184 | desc->chip->shutdown(i); | 184 | desc->irq_data.chip->shutdown(i); |
185 | } | 185 | } |
186 | raw_spin_unlock_irq(&desc->lock); | 186 | raw_spin_unlock_irq(&desc->lock); |
187 | } | 187 | } |