Skip to content

Commit

Permalink
ppc-6xx: fix build failure in flipper-pic.c and hlwd-pic.c
Browse files Browse the repository at this point in the history
The commit bae1d8f (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>
  • Loading branch information
Paul Gortmaker authored and Grant Likely committed Feb 23, 2012
1 parent 2462bac commit 6d166fe
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
6 changes: 3 additions & 3 deletions arch/powerpc/platforms/embedded6xx/flipper-pic.c
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ struct irq_domain * __init flipper_pic_init(struct device_node *np)

unsigned int flipper_pic_get_irq(void)
{
void __iomem *io_base = flipper_irq_domain->host_data;
void __iomem *io_base = flipper_irq_host->host_data;
int irq;
u32 irq_status;

Expand All @@ -182,7 +182,7 @@ unsigned int flipper_pic_get_irq(void)
return NO_IRQ; /* no more IRQs pending */

irq = __ffs(irq_status);
return irq_linear_revmap(flipper_irq_domain, irq);
return irq_linear_revmap(flipper_irq_host, irq);
}

/*
Expand All @@ -197,7 +197,7 @@ void __init flipper_pic_probe(void)
np = of_find_compatible_node(NULL, NULL, "nintendo,flipper-pic");
BUG_ON(!np);

flipper_irq_domain = flipper_pic_init(np);
flipper_irq_host = flipper_pic_init(np);
BUG_ON(!flipper_irq_host);

irq_set_default_host(flipper_irq_host);
Expand Down
6 changes: 3 additions & 3 deletions arch/powerpc/platforms/embedded6xx/hlwd-pic.c
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ struct irq_domain *hlwd_pic_init(struct device_node *np)

unsigned int hlwd_pic_get_irq(void)
{
return __hlwd_pic_get_irq(hlwd_irq_domain);
return __hlwd_pic_get_irq(hlwd_irq_host);
}

/*
Expand All @@ -213,7 +213,7 @@ void hlwd_pic_probe(void)
irq_set_handler_data(cascade_virq, host);
irq_set_chained_handler(cascade_virq,
hlwd_pic_irq_cascade);
hlwd_irq_domain = host;
hlwd_irq_host = host;
break;
}
}
Expand All @@ -227,7 +227,7 @@ void hlwd_pic_probe(void)
*/
void hlwd_quiesce(void)
{
void __iomem *io_base = hlwd_irq_domain->host_data;
void __iomem *io_base = hlwd_irq_host->host_data;

__hlwd_quiesce(io_base);
}
Expand Down

0 comments on commit 6d166fe

Please sign in to comment.