Commit 0da2f0f164f098bb4447c714b552ac1681b2d6e8
Committed by
Linus Torvalds
1 parent
071922c08c
Exists in
master
and in
7 other branches
potential compiler error, irqfunc caller sites update
In 7d12e780e003f93433d49ce78cfedf4b4c52adc5 David Howells performed this evolution: "IRQ: Maintain regs pointer globally rather than passing to IRQ handlers" He correctly updated many of the function definitions that were using this extra regs pointer parameter but forgot to update some caller sites of those functions. The reason the modifications was not properly done on all drivers is that some drivers were rarely compiled because they are for AMIGA, or that some code sites were inside #ifdefs where the option is not set or inside #if 0. Here is the semantic patch that found the occurences and fixed the problem. @ rule1 @ identifier fn; identifier irq, dev_id; typedef irqreturn_t; @@ static irqreturn_t fn(int irq, void *dev_id) { ... } @@ identifier rule1.fn; expression E1, E2, E3; @@ fn(E1, E2 - ,E3 ) Signed-off-by: Yoann Padioleau <padator@wanadoo.fr> Cc: "David S. Miller" <davem@davemloft.net> Cc: Jeff Garzik <jeff@garzik.org> Cc: Greg KH <greg@kroah.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Showing 5 changed files with 5 additions and 5 deletions Side-by-side Diff
drivers/atm/firestream.c
drivers/net/arm/am79c961a.c
drivers/net/ixp2000/ixpdev.c
... | ... | @@ -222,7 +222,7 @@ |
222 | 222 | static void ixpdev_poll_controller(struct net_device *dev) |
223 | 223 | { |
224 | 224 | disable_irq(IRQ_IXP2000_THDA0); |
225 | - ixpdev_interrupt(IRQ_IXP2000_THDA0, dev, NULL); | |
225 | + ixpdev_interrupt(IRQ_IXP2000_THDA0, dev); | |
226 | 226 | enable_irq(IRQ_IXP2000_THDA0); |
227 | 227 | } |
228 | 228 | #endif |
drivers/net/sb1250-mac.c
drivers/usb/misc/uss720.c
... | ... | @@ -336,7 +336,7 @@ |
336 | 336 | memcpy(priv->reg, buffer, 4); |
337 | 337 | /* if nAck interrupts are enabled and we have an interrupt, call the interrupt procedure */ |
338 | 338 | if (priv->reg[2] & priv->reg[1] & 0x10) |
339 | - parport_generic_irq(0, pp, NULL); | |
339 | + parport_generic_irq(0, pp); | |
340 | 340 | return 1; |
341 | 341 | } |
342 | 342 | #endif |