Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 67284
b: refs/heads/master
c: 6815800
h: refs/heads/master
v: v3
  • Loading branch information
Michael Ellerman authored and Paul Mackerras committed Sep 13, 2007
1 parent 5eb89c6 commit ce46983
Show file tree
Hide file tree
Showing 12 changed files with 10 additions and 63 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 8528ab84ebe7a1eeed9b0acc808df86663d506c0
refs/heads/master: 6815800601d3e46b976c868e4e85fb6de32b9133
10 changes: 9 additions & 1 deletion trunk/arch/powerpc/kernel/irq.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -418,6 +418,11 @@ irq_hw_number_t virq_to_hw(unsigned int virq)
}
EXPORT_SYMBOL_GPL(virq_to_hw);

static int default_irq_host_match(struct irq_host *h, struct device_node *np)
{
return h->of_node != NULL && h->of_node == np;
}

__init_refok struct irq_host *irq_alloc_host(struct device_node *of_node,
unsigned int revmap_type,
unsigned int revmap_arg,
Expand Down Expand Up @@ -449,6 +454,9 @@ __init_refok struct irq_host *irq_alloc_host(struct device_node *of_node,
host->ops = ops;
host->of_node = of_node;

if (host->ops->match == NULL)
host->ops->match = default_irq_host_match;

spin_lock_irqsave(&irq_big_lock, flags);

/* If it's a legacy controller, check for duplicates and
Expand Down Expand Up @@ -523,7 +531,7 @@ struct irq_host *irq_find_host(struct device_node *node)
*/
spin_lock_irqsave(&irq_big_lock, flags);
list_for_each_entry(h, &irq_hosts, link)
if (h->ops->match != NULL && h->ops->match(h, node)) {
if (h->ops->match(h, node)) {
found = h;
break;
}
Expand Down
7 changes: 0 additions & 7 deletions trunk/arch/powerpc/platforms/52xx/mpc52xx_pic.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -241,12 +241,6 @@ static struct irq_chip mpc52xx_sdma_irqchip = {
* irq_host
*/

static int mpc52xx_irqhost_match(struct irq_host *h, struct device_node *node)
{
pr_debug("%s: node=%p\n", __func__, node);
return h->of_node == node;
}

static int mpc52xx_irqhost_xlate(struct irq_host *h, struct device_node *ct,
u32 * intspec, unsigned int intsize,
irq_hw_number_t * out_hwirq,
Expand Down Expand Up @@ -367,7 +361,6 @@ static int mpc52xx_irqhost_map(struct irq_host *h, unsigned int virq,
}

static struct irq_host_ops mpc52xx_irqhost_ops = {
.match = mpc52xx_irqhost_match,
.xlate = mpc52xx_irqhost_xlate,
.map = mpc52xx_irqhost_map,
};
Expand Down
6 changes: 0 additions & 6 deletions trunk/arch/powerpc/platforms/82xx/mpc82xx_ads.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -398,11 +398,6 @@ m82xx_pci_irq_demux(unsigned int irq, struct irq_desc *desc)
}
}

static int pci_pic_host_match(struct irq_host *h, struct device_node *node)
{
return h->of_node == node;
}

static int pci_pic_host_map(struct irq_host *h, unsigned int virq,
irq_hw_number_t hw)
{
Expand All @@ -418,7 +413,6 @@ static void pci_host_unmap(struct irq_host *h, unsigned int virq)
}

static struct irq_host_ops pci_pic_host_ops = {
.match = pci_pic_host_match,
.map = pci_pic_host_map,
.unmap = pci_host_unmap,
};
Expand Down
6 changes: 0 additions & 6 deletions trunk/arch/powerpc/platforms/cell/axon_msi.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -294,13 +294,7 @@ static int msic_host_map(struct irq_host *h, unsigned int virq,
return 0;
}

static int msic_host_match(struct irq_host *host, struct device_node *dn)
{
return host->of_node == dn;
}

static struct irq_host_ops msic_host_ops = {
.match = msic_host_match,
.map = msic_host_map,
};

Expand Down
6 changes: 0 additions & 6 deletions trunk/arch/powerpc/platforms/cell/spider-pic.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -175,11 +175,6 @@ static struct irq_chip spider_pic = {
.set_type = spider_set_irq_type,
};

static int spider_host_match(struct irq_host *h, struct device_node *node)
{
return h->of_node == node;
}

static int spider_host_map(struct irq_host *h, unsigned int virq,
irq_hw_number_t hw)
{
Expand All @@ -206,7 +201,6 @@ static int spider_host_xlate(struct irq_host *h, struct device_node *ct,
}

static struct irq_host_ops spider_host_ops = {
.match = spider_host_match,
.map = spider_host_map,
.xlate = spider_host_xlate,
};
Expand Down
6 changes: 0 additions & 6 deletions trunk/arch/powerpc/sysdev/commproc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,11 +94,6 @@ int cpm_get_irq(void)
return irq_linear_revmap(cpm_pic_host, cpm_vec);
}

static int cpm_pic_host_match(struct irq_host *h, struct device_node *node)
{
return h->of_node == node;
}

static int cpm_pic_host_map(struct irq_host *h, unsigned int virq,
irq_hw_number_t hw)
{
Expand Down Expand Up @@ -126,7 +121,6 @@ static struct irqaction cpm_error_irqaction = {
};

static struct irq_host_ops cpm_pic_host_ops = {
.match = cpm_pic_host_match,
.map = cpm_pic_host_map,
};

Expand Down
6 changes: 0 additions & 6 deletions trunk/arch/powerpc/sysdev/cpm2_pic.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -205,11 +205,6 @@ unsigned int cpm2_get_irq(void)
return irq_linear_revmap(cpm2_pic_host, irq);
}

static int cpm2_pic_host_match(struct irq_host *h, struct device_node *node)
{
return h->of_node == node;
}

static int cpm2_pic_host_map(struct irq_host *h, unsigned int virq,
irq_hw_number_t hw)
{
Expand All @@ -233,7 +228,6 @@ static int cpm2_pic_host_xlate(struct irq_host *h, struct device_node *ct,
}

static struct irq_host_ops cpm2_pic_host_ops = {
.match = cpm2_pic_host_match,
.map = cpm2_pic_host_map,
.xlate = cpm2_pic_host_xlate,
};
Expand Down
6 changes: 0 additions & 6 deletions trunk/arch/powerpc/sysdev/mpc8xx_pic.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -119,11 +119,6 @@ unsigned int mpc8xx_get_irq(void)

}

static int mpc8xx_pic_host_match(struct irq_host *h, struct device_node *node)
{
return h->of_node == node;
}

static int mpc8xx_pic_host_map(struct irq_host *h, unsigned int virq,
irq_hw_number_t hw)
{
Expand Down Expand Up @@ -157,7 +152,6 @@ static int mpc8xx_pic_host_xlate(struct irq_host *h, struct device_node *ct,


static struct irq_host_ops mpc8xx_pic_host_ops = {
.match = mpc8xx_pic_host_match,
.map = mpc8xx_pic_host_map,
.xlate = mpc8xx_pic_host_xlate,
};
Expand Down
6 changes: 0 additions & 6 deletions trunk/arch/powerpc/sysdev/mv64x60_pic.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -202,11 +202,6 @@ static struct irq_chip mv64x60_chip_gpp = {
* mv64x60_host_ops functions
*/

static int mv64x60_host_match(struct irq_host *h, struct device_node *np)
{
return h->of_node == np;
}

static struct irq_chip *mv64x60_chips[] = {
[MV64x60_LEVEL1_LOW] = &mv64x60_chip_low,
[MV64x60_LEVEL1_HIGH] = &mv64x60_chip_high,
Expand All @@ -228,7 +223,6 @@ static int mv64x60_host_map(struct irq_host *h, unsigned int virq,
}

static struct irq_host_ops mv64x60_host_ops = {
.match = mv64x60_host_match,
.map = mv64x60_host_map,
};

Expand Down
6 changes: 0 additions & 6 deletions trunk/arch/powerpc/sysdev/tsi108_pci.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -404,13 +404,7 @@ static int pci_irq_host_map(struct irq_host *h, unsigned int virq,
return 0;
}

static int pci_irq_host_match(struct irq_host *h, struct device_node *node)
{
return h->of_node == node;
}

static struct irq_host_ops pci_irq_host_ops = {
.match = pci_irq_host_match,
.map = pci_irq_host_map,
.xlate = pci_irq_host_xlate,
};
Expand Down
6 changes: 0 additions & 6 deletions trunk/arch/powerpc/sysdev/uic.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -215,11 +215,6 @@ void fastcall handle_uic_irq(unsigned int irq, struct irq_desc *desc)
spin_unlock(&desc->lock);
}

static int uic_host_match(struct irq_host *h, struct device_node *node)
{
return h->of_node == node;
}

static int uic_host_map(struct irq_host *h, unsigned int virq,
irq_hw_number_t hw)
{
Expand Down Expand Up @@ -249,7 +244,6 @@ static int uic_host_xlate(struct irq_host *h, struct device_node *ct,
}

static struct irq_host_ops uic_host_ops = {
.match = uic_host_match,
.map = uic_host_map,
.xlate = uic_host_xlate,
};
Expand Down

0 comments on commit ce46983

Please sign in to comment.