| Message ID | 20180510215919.27808-2-j.neuschaefer@gmx.net (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | c068e6b8caa0c796535cb12f64767cc521b20508 |
| Headers | show |
| Series | powerpc: Wii IRQ fixes | expand |
On Thu, 2018-05-10 at 21:59:18 UTC, =?utf-8?q?Jonathan_Neusch=C3=A4fer?= wrote: > On the Wii, there is a secondary IRQ controller (hlwd-pic), so > flipper-pic's match operation should not be hardcoded to return 1. > In fact, the default matching logic is sufficient, and we can completely > omit flipper_pic_match. > > Signed-off-by: Jonathan Neuschäfer <j.neuschaefer@gmx.net> Series applied to powerpc next, thanks. https://git.kernel.org/powerpc/c/c068e6b8caa0c796535cb12f64767c cheers
diff --git a/arch/powerpc/platforms/embedded6xx/flipper-pic.c b/arch/powerpc/platforms/embedded6xx/flipper-pic.c index 7206f3f573d4..db0be007fd06 100644 --- a/arch/powerpc/platforms/embedded6xx/flipper-pic.c +++ b/arch/powerpc/platforms/embedded6xx/flipper-pic.c @@ -108,16 +108,8 @@ static int flipper_pic_map(struct irq_domain *h, unsigned int virq, return 0; } -static int flipper_pic_match(struct irq_domain *h, struct device_node *np, - enum irq_domain_bus_token bus_token) -{ - return 1; -} - - static const struct irq_domain_ops flipper_irq_domain_ops = { .map = flipper_pic_map, - .match = flipper_pic_match, }; /*
On the Wii, there is a secondary IRQ controller (hlwd-pic), so flipper-pic's match operation should not be hardcoded to return 1. In fact, the default matching logic is sufficient, and we can completely omit flipper_pic_match. Signed-off-by: Jonathan Neuschäfer <j.neuschaefer@gmx.net> --- Note: This shouldn't break Linux on the GameCube, but I've only tested on the Wii. Some confirmation that I didn't break interrupt handling on the GC would be nice. (If someone still runs mainline on the GC.) --- arch/powerpc/platforms/embedded6xx/flipper-pic.c | 8 -------- 1 file changed, 8 deletions(-)