diff options
author | Milton Miller <miltonm@bga.com> | 2011-05-10 15:30:00 -0400 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2011-05-19 01:31:39 -0400 |
commit | df74e70ac25fc4bf4036a2f9690b4e2e4520e65d (patch) | |
tree | b0ee6dc5ce671c28f6ae2d8615d0f5294d466c1e /arch | |
parent | 2d441681a4df7822e6ef6fcc0320bb14d2a06dbb (diff) |
powerpc: Remove trival irq_host_ops.unmap
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>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/powerpc/platforms/82xx/pq2ads-pci-pic.c | 8 | ||||
-rw-r--r-- | arch/powerpc/platforms/embedded6xx/flipper-pic.c | 7 | ||||
-rw-r--r-- | arch/powerpc/platforms/embedded6xx/hlwd-pic.c | 7 | ||||
-rw-r--r-- | arch/powerpc/platforms/ps3/interrupt.c | 6 |
4 files changed, 0 insertions, 28 deletions
diff --git a/arch/powerpc/platforms/82xx/pq2ads-pci-pic.c b/arch/powerpc/platforms/82xx/pq2ads-pci-pic.c index 5d6c34ce0cba..8ccf9ed62fe2 100644 --- a/arch/powerpc/platforms/82xx/pq2ads-pci-pic.c +++ b/arch/powerpc/platforms/82xx/pq2ads-pci-pic.c | |||
@@ -112,16 +112,8 @@ static int pci_pic_host_map(struct irq_host *h, unsigned int virq, | |||
112 | return 0; | 112 | return 0; |
113 | } | 113 | } |
114 | 114 | ||
115 | static void pci_host_unmap(struct irq_host *h, unsigned int virq) | ||
116 | { | ||
117 | /* remove chip and handler */ | ||
118 | irq_set_chip_data(virq, NULL); | ||
119 | irq_set_chip(virq, NULL); | ||
120 | } | ||
121 | |||
122 | static struct irq_host_ops pci_pic_host_ops = { | 115 | static struct irq_host_ops pci_pic_host_ops = { |
123 | .map = pci_pic_host_map, | 116 | .map = pci_pic_host_map, |
124 | .unmap = pci_host_unmap, | ||
125 | }; | 117 | }; |
126 | 118 | ||
127 | int __init pq2ads_pci_init_irq(void) | 119 | int __init pq2ads_pci_init_irq(void) |
diff --git a/arch/powerpc/platforms/embedded6xx/flipper-pic.c b/arch/powerpc/platforms/embedded6xx/flipper-pic.c index 77cbe4c8f953..f61a2dd96b99 100644 --- a/arch/powerpc/platforms/embedded6xx/flipper-pic.c +++ b/arch/powerpc/platforms/embedded6xx/flipper-pic.c | |||
@@ -107,12 +107,6 @@ static int flipper_pic_map(struct irq_host *h, unsigned int virq, | |||
107 | return 0; | 107 | return 0; |
108 | } | 108 | } |
109 | 109 | ||
110 | static void flipper_pic_unmap(struct irq_host *h, unsigned int irq) | ||
111 | { | ||
112 | irq_set_chip_data(irq, NULL); | ||
113 | irq_set_chip(irq, NULL); | ||
114 | } | ||
115 | |||
116 | static int flipper_pic_match(struct irq_host *h, struct device_node *np) | 110 | static int flipper_pic_match(struct irq_host *h, struct device_node *np) |
117 | { | 111 | { |
118 | return 1; | 112 | return 1; |
@@ -121,7 +115,6 @@ static int flipper_pic_match(struct irq_host *h, struct device_node *np) | |||
121 | 115 | ||
122 | static struct irq_host_ops flipper_irq_host_ops = { | 116 | static struct irq_host_ops flipper_irq_host_ops = { |
123 | .map = flipper_pic_map, | 117 | .map = flipper_pic_map, |
124 | .unmap = flipper_pic_unmap, | ||
125 | .match = flipper_pic_match, | 118 | .match = flipper_pic_match, |
126 | }; | 119 | }; |
127 | 120 | ||
diff --git a/arch/powerpc/platforms/embedded6xx/hlwd-pic.c b/arch/powerpc/platforms/embedded6xx/hlwd-pic.c index 44b398b0a2fd..e4919170c6bc 100644 --- a/arch/powerpc/platforms/embedded6xx/hlwd-pic.c +++ b/arch/powerpc/platforms/embedded6xx/hlwd-pic.c | |||
@@ -100,15 +100,8 @@ static int hlwd_pic_map(struct irq_host *h, unsigned int virq, | |||
100 | return 0; | 100 | return 0; |
101 | } | 101 | } |
102 | 102 | ||
103 | static void hlwd_pic_unmap(struct irq_host *h, unsigned int irq) | ||
104 | { | ||
105 | irq_set_chip_data(irq, NULL); | ||
106 | irq_set_chip(irq, NULL); | ||
107 | } | ||
108 | |||
109 | static struct irq_host_ops hlwd_irq_host_ops = { | 103 | static struct irq_host_ops hlwd_irq_host_ops = { |
110 | .map = hlwd_pic_map, | 104 | .map = hlwd_pic_map, |
111 | .unmap = hlwd_pic_unmap, | ||
112 | }; | 105 | }; |
113 | 106 | ||
114 | static unsigned int __hlwd_pic_get_irq(struct irq_host *h) | 107 | static unsigned int __hlwd_pic_get_irq(struct irq_host *h) |
diff --git a/arch/powerpc/platforms/ps3/interrupt.c b/arch/powerpc/platforms/ps3/interrupt.c index 523bd0d34d9d..600ed2c0ed59 100644 --- a/arch/powerpc/platforms/ps3/interrupt.c +++ b/arch/powerpc/platforms/ps3/interrupt.c | |||
@@ -659,11 +659,6 @@ static void __maybe_unused _dump_mask(struct ps3_private *pd, | |||
659 | static void dump_bmp(struct ps3_private* pd) {}; | 659 | static void dump_bmp(struct ps3_private* pd) {}; |
660 | #endif /* defined(DEBUG) */ | 660 | #endif /* defined(DEBUG) */ |
661 | 661 | ||
662 | static void ps3_host_unmap(struct irq_host *h, unsigned int virq) | ||
663 | { | ||
664 | irq_set_chip_data(virq, NULL); | ||
665 | } | ||
666 | |||
667 | static int ps3_host_map(struct irq_host *h, unsigned int virq, | 662 | static int ps3_host_map(struct irq_host *h, unsigned int virq, |
668 | irq_hw_number_t hwirq) | 663 | irq_hw_number_t hwirq) |
669 | { | 664 | { |
@@ -683,7 +678,6 @@ static int ps3_host_match(struct irq_host *h, struct device_node *np) | |||
683 | 678 | ||
684 | static struct irq_host_ops ps3_host_ops = { | 679 | static struct irq_host_ops ps3_host_ops = { |
685 | .map = ps3_host_map, | 680 | .map = ps3_host_map, |
686 | .unmap = ps3_host_unmap, | ||
687 | .match = ps3_host_match, | 681 | .match = ps3_host_match, |
688 | }; | 682 | }; |
689 | 683 | ||