Skip to content

Commit

Permalink
powerpc: Remove trival irq_host_ops.unmap
Browse files Browse the repository at this point in the history
These all just clear chip or chipdata fields, which will be done
by the generic code when we call irq_free_descs.

Signed-off-by: Milton Miller <miltonm@bga.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
  • Loading branch information
Milton Miller authored and Benjamin Herrenschmidt committed May 19, 2011
1 parent 2d44168 commit df74e70
Show file tree
Hide file tree
Showing 4 changed files with 0 additions and 28 deletions.
8 changes: 0 additions & 8 deletions arch/powerpc/platforms/82xx/pq2ads-pci-pic.c
Original file line number Diff line number Diff line change
Expand Up @@ -112,16 +112,8 @@ static int pci_pic_host_map(struct irq_host *h, unsigned int virq,
return 0;
}

static void pci_host_unmap(struct irq_host *h, unsigned int virq)
{
/* remove chip and handler */
irq_set_chip_data(virq, NULL);
irq_set_chip(virq, NULL);
}

static struct irq_host_ops pci_pic_host_ops = {
.map = pci_pic_host_map,
.unmap = pci_host_unmap,
};

int __init pq2ads_pci_init_irq(void)
Expand Down
7 changes: 0 additions & 7 deletions arch/powerpc/platforms/embedded6xx/flipper-pic.c
Original file line number Diff line number Diff line change
Expand Up @@ -107,12 +107,6 @@ static int flipper_pic_map(struct irq_host *h, unsigned int virq,
return 0;
}

static void flipper_pic_unmap(struct irq_host *h, unsigned int irq)
{
irq_set_chip_data(irq, NULL);
irq_set_chip(irq, NULL);
}

static int flipper_pic_match(struct irq_host *h, struct device_node *np)
{
return 1;
Expand All @@ -121,7 +115,6 @@ static int flipper_pic_match(struct irq_host *h, struct device_node *np)

static struct irq_host_ops flipper_irq_host_ops = {
.map = flipper_pic_map,
.unmap = flipper_pic_unmap,
.match = flipper_pic_match,
};

Expand Down
7 changes: 0 additions & 7 deletions arch/powerpc/platforms/embedded6xx/hlwd-pic.c
Original file line number Diff line number Diff line change
Expand Up @@ -100,15 +100,8 @@ static int hlwd_pic_map(struct irq_host *h, unsigned int virq,
return 0;
}

static void hlwd_pic_unmap(struct irq_host *h, unsigned int irq)
{
irq_set_chip_data(irq, NULL);
irq_set_chip(irq, NULL);
}

static struct irq_host_ops hlwd_irq_host_ops = {
.map = hlwd_pic_map,
.unmap = hlwd_pic_unmap,
};

static unsigned int __hlwd_pic_get_irq(struct irq_host *h)
Expand Down
6 changes: 0 additions & 6 deletions arch/powerpc/platforms/ps3/interrupt.c
Original file line number Diff line number Diff line change
Expand Up @@ -659,11 +659,6 @@ static void __maybe_unused _dump_mask(struct ps3_private *pd,
static void dump_bmp(struct ps3_private* pd) {};
#endif /* defined(DEBUG) */

static void ps3_host_unmap(struct irq_host *h, unsigned int virq)
{
irq_set_chip_data(virq, NULL);
}

static int ps3_host_map(struct irq_host *h, unsigned int virq,
irq_hw_number_t hwirq)
{
Expand All @@ -683,7 +678,6 @@ static int ps3_host_match(struct irq_host *h, struct device_node *np)

static struct irq_host_ops ps3_host_ops = {
.map = ps3_host_map,
.unmap = ps3_host_unmap,
.match = ps3_host_match,
};

Expand Down

0 comments on commit df74e70

Please sign in to comment.