diff options
-rw-r--r-- | arch/powerpc/include/asm/irq.h | 3 | ||||
-rw-r--r-- | arch/powerpc/kernel/irq.c | 2 | ||||
-rw-r--r-- | arch/powerpc/platforms/cell/beat_interrupt.c | 11 |
3 files changed, 0 insertions, 16 deletions
diff --git a/arch/powerpc/include/asm/irq.h b/arch/powerpc/include/asm/irq.h index e1983d577688..6f4a3efb59a9 100644 --- a/arch/powerpc/include/asm/irq.h +++ b/arch/powerpc/include/asm/irq.h | |||
@@ -88,9 +88,6 @@ struct irq_host_ops { | |||
88 | /* Dispose of such a mapping */ | 88 | /* Dispose of such a mapping */ |
89 | void (*unmap)(struct irq_host *h, unsigned int virq); | 89 | void (*unmap)(struct irq_host *h, unsigned int virq); |
90 | 90 | ||
91 | /* Update of such a mapping */ | ||
92 | void (*remap)(struct irq_host *h, unsigned int virq, irq_hw_number_t hw); | ||
93 | |||
94 | /* Translate device-tree interrupt specifier from raw format coming | 91 | /* Translate device-tree interrupt specifier from raw format coming |
95 | * from the firmware to a irq_hw_number_t (interrupt line number) and | 92 | * from the firmware to a irq_hw_number_t (interrupt line number) and |
96 | * type (sense) that can be passed to set_irq_type(). In the absence | 93 | * type (sense) that can be passed to set_irq_type(). In the absence |
diff --git a/arch/powerpc/kernel/irq.c b/arch/powerpc/kernel/irq.c index 4a5aa8ca97a5..0715a09a4101 100644 --- a/arch/powerpc/kernel/irq.c +++ b/arch/powerpc/kernel/irq.c | |||
@@ -732,8 +732,6 @@ unsigned int irq_create_mapping(struct irq_host *host, | |||
732 | */ | 732 | */ |
733 | virq = irq_find_mapping(host, hwirq); | 733 | virq = irq_find_mapping(host, hwirq); |
734 | if (virq != NO_IRQ) { | 734 | if (virq != NO_IRQ) { |
735 | if (host->ops->remap) | ||
736 | host->ops->remap(host, virq, hwirq); | ||
737 | pr_debug("irq: -> existing mapping on virq %d\n", virq); | 735 | pr_debug("irq: -> existing mapping on virq %d\n", virq); |
738 | return virq; | 736 | return virq; |
739 | } | 737 | } |
diff --git a/arch/powerpc/platforms/cell/beat_interrupt.c b/arch/powerpc/platforms/cell/beat_interrupt.c index d46f7e47a1dc..55015e1f6939 100644 --- a/arch/powerpc/platforms/cell/beat_interrupt.c +++ b/arch/powerpc/platforms/cell/beat_interrupt.c | |||
@@ -148,16 +148,6 @@ static int beatic_pic_host_map(struct irq_host *h, unsigned int virq, | |||
148 | } | 148 | } |
149 | 149 | ||
150 | /* | 150 | /* |
151 | * Update binding hardware IRQ number (hw) and Virtuql | ||
152 | * IRQ number (virq). This is called only once for a given mapping. | ||
153 | */ | ||
154 | static void beatic_pic_host_remap(struct irq_host *h, unsigned int virq, | ||
155 | irq_hw_number_t hw) | ||
156 | { | ||
157 | beat_construct_and_connect_irq_plug(virq, hw); | ||
158 | } | ||
159 | |||
160 | /* | ||
161 | * Translate device-tree interrupt spec to irq_hw_number_t style (ulong), | 151 | * Translate device-tree interrupt spec to irq_hw_number_t style (ulong), |
162 | * to pass away to irq_create_mapping(). | 152 | * to pass away to irq_create_mapping(). |
163 | * | 153 | * |
@@ -184,7 +174,6 @@ static int beatic_pic_host_match(struct irq_host *h, struct device_node *np) | |||
184 | 174 | ||
185 | static struct irq_host_ops beatic_pic_host_ops = { | 175 | static struct irq_host_ops beatic_pic_host_ops = { |
186 | .map = beatic_pic_host_map, | 176 | .map = beatic_pic_host_map, |
187 | .remap = beatic_pic_host_remap, | ||
188 | .unmap = beatic_pic_host_unmap, | 177 | .unmap = beatic_pic_host_unmap, |
189 | .xlate = beatic_pic_host_xlate, | 178 | .xlate = beatic_pic_host_xlate, |
190 | .match = beatic_pic_host_match, | 179 | .match = beatic_pic_host_match, |