diff options
Diffstat (limited to 'arch/powerpc/platforms/embedded6xx')
-rw-r--r-- | arch/powerpc/platforms/embedded6xx/flipper-pic.c | 6 | ||||
-rw-r--r-- | arch/powerpc/platforms/embedded6xx/hlwd-pic.c | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/arch/powerpc/platforms/embedded6xx/flipper-pic.c b/arch/powerpc/platforms/embedded6xx/flipper-pic.c index 675335a52648..53d6eee01963 100644 --- a/arch/powerpc/platforms/embedded6xx/flipper-pic.c +++ b/arch/powerpc/platforms/embedded6xx/flipper-pic.c | |||
@@ -172,7 +172,7 @@ out: | |||
172 | 172 | ||
173 | unsigned int flipper_pic_get_irq(void) | 173 | unsigned int flipper_pic_get_irq(void) |
174 | { | 174 | { |
175 | void __iomem *io_base = flipper_irq_domain->host_data; | 175 | void __iomem *io_base = flipper_irq_host->host_data; |
176 | int irq; | 176 | int irq; |
177 | u32 irq_status; | 177 | u32 irq_status; |
178 | 178 | ||
@@ -182,7 +182,7 @@ unsigned int flipper_pic_get_irq(void) | |||
182 | return NO_IRQ; /* no more IRQs pending */ | 182 | return NO_IRQ; /* no more IRQs pending */ |
183 | 183 | ||
184 | irq = __ffs(irq_status); | 184 | irq = __ffs(irq_status); |
185 | return irq_linear_revmap(flipper_irq_domain, irq); | 185 | return irq_linear_revmap(flipper_irq_host, irq); |
186 | } | 186 | } |
187 | 187 | ||
188 | /* | 188 | /* |
@@ -197,7 +197,7 @@ void __init flipper_pic_probe(void) | |||
197 | np = of_find_compatible_node(NULL, NULL, "nintendo,flipper-pic"); | 197 | np = of_find_compatible_node(NULL, NULL, "nintendo,flipper-pic"); |
198 | BUG_ON(!np); | 198 | BUG_ON(!np); |
199 | 199 | ||
200 | flipper_irq_domain = flipper_pic_init(np); | 200 | flipper_irq_host = flipper_pic_init(np); |
201 | BUG_ON(!flipper_irq_host); | 201 | BUG_ON(!flipper_irq_host); |
202 | 202 | ||
203 | irq_set_default_host(flipper_irq_host); | 203 | irq_set_default_host(flipper_irq_host); |
diff --git a/arch/powerpc/platforms/embedded6xx/hlwd-pic.c b/arch/powerpc/platforms/embedded6xx/hlwd-pic.c index da6ca02c43ac..3006b5117ec6 100644 --- a/arch/powerpc/platforms/embedded6xx/hlwd-pic.c +++ b/arch/powerpc/platforms/embedded6xx/hlwd-pic.c | |||
@@ -189,7 +189,7 @@ struct irq_domain *hlwd_pic_init(struct device_node *np) | |||
189 | 189 | ||
190 | unsigned int hlwd_pic_get_irq(void) | 190 | unsigned int hlwd_pic_get_irq(void) |
191 | { | 191 | { |
192 | return __hlwd_pic_get_irq(hlwd_irq_domain); | 192 | return __hlwd_pic_get_irq(hlwd_irq_host); |
193 | } | 193 | } |
194 | 194 | ||
195 | /* | 195 | /* |
@@ -213,7 +213,7 @@ void hlwd_pic_probe(void) | |||
213 | irq_set_handler_data(cascade_virq, host); | 213 | irq_set_handler_data(cascade_virq, host); |
214 | irq_set_chained_handler(cascade_virq, | 214 | irq_set_chained_handler(cascade_virq, |
215 | hlwd_pic_irq_cascade); | 215 | hlwd_pic_irq_cascade); |
216 | hlwd_irq_domain = host; | 216 | hlwd_irq_host = host; |
217 | break; | 217 | break; |
218 | } | 218 | } |
219 | } | 219 | } |
@@ -227,7 +227,7 @@ void hlwd_pic_probe(void) | |||
227 | */ | 227 | */ |
228 | void hlwd_quiesce(void) | 228 | void hlwd_quiesce(void) |
229 | { | 229 | { |
230 | void __iomem *io_base = hlwd_irq_domain->host_data; | 230 | void __iomem *io_base = hlwd_irq_host->host_data; |
231 | 231 | ||
232 | __hlwd_quiesce(io_base); | 232 | __hlwd_quiesce(io_base); |
233 | } | 233 | } |