Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ppc-6xx: fix build failure in flipper-pic.c and hlwd-pic.c

The commit bae1d8f19983fbfa25559aa3cb6a81a84aa82a18 (linux-next)

"irq_domain/powerpc: Use common irq_domain structure instead of irq_host"

made this change:

-static struct irq_host *flipper_irq_host;
+static struct irq_domain *flipper_irq_host;

and this change:

-static struct irq_host *hlwd_irq_host;
+static struct irq_domain *hlwd_irq_host;

The intent was to change the type, and not the name, but then in a
couple of instances, it looks like the sed to change the irq_domain_ops
name inadvertently also changed the irq_host name where it was not
supposed to, causing build failures.

Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>

authored by

Paul Gortmaker and committed by
Grant Likely
6d166fec 2462bacd

+6 -6
+3 -3
arch/powerpc/platforms/embedded6xx/flipper-pic.c
··· 172 172 173 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 176 int irq; 177 177 u32 irq_status; 178 178 ··· 182 182 return NO_IRQ; /* no more IRQs pending */ 183 183 184 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 197 np = of_find_compatible_node(NULL, NULL, "nintendo,flipper-pic"); 198 198 BUG_ON(!np); 199 199 200 - flipper_irq_domain = flipper_pic_init(np); 200 + flipper_irq_host = flipper_pic_init(np); 201 201 BUG_ON(!flipper_irq_host); 202 202 203 203 irq_set_default_host(flipper_irq_host);
+3 -3
arch/powerpc/platforms/embedded6xx/hlwd-pic.c
··· 189 189 190 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 213 irq_set_handler_data(cascade_virq, host); 214 214 irq_set_chained_handler(cascade_virq, 215 215 hlwd_pic_irq_cascade); 216 - hlwd_irq_domain = host; 216 + hlwd_irq_host = host; 217 217 break; 218 218 } 219 219 } ··· 227 227 */ 228 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 232 __hlwd_quiesce(io_base); 233 233 }