tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

hamradio/scc: kill unnecessary use of 'irq' function arg

Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

authored by

Jeff Garzik and committed by
David S. Miller 1b36efe0 ef878b88

+5 -3
+5 -3
drivers/net/hamradio/scc.c
··· 201 201 202 202 static void init_channel(struct scc_channel *scc); 203 203 static void scc_key_trx (struct scc_channel *scc, char tx); 204 - static irqreturn_t scc_isr(int irq, void *dev_id); 205 204 static void scc_init_timer(struct scc_channel *scc); 206 205 207 206 static int scc_net_alloc(const char *name, struct scc_channel *scc); ··· 628 629 629 630 static irqreturn_t scc_isr(int irq, void *dev_id) 630 631 { 632 + int chip_irq = (long) dev_id; 631 633 unsigned char vector; 632 634 struct scc_channel *scc; 633 635 struct scc_ctrl *ctrl; ··· 665 665 ctrl = SCC_ctrl; 666 666 while (ctrl->chan_A) 667 667 { 668 - if (ctrl->irq != irq) 668 + if (ctrl->irq != chip_irq) 669 669 { 670 670 ctrl++; 671 671 continue; ··· 1732 1732 1733 1733 if (!Ivec[hwcfg.irq].used && hwcfg.irq) 1734 1734 { 1735 - if (request_irq(hwcfg.irq, scc_isr, IRQF_DISABLED, "AX.25 SCC", NULL)) 1735 + if (request_irq(hwcfg.irq, scc_isr, 1736 + IRQF_DISABLED, "AX.25 SCC", 1737 + (void *)(long) hwcfg.irq)) 1736 1738 printk(KERN_WARNING "z8530drv: warning, cannot get IRQ %d\n", hwcfg.irq); 1737 1739 else 1738 1740 Ivec[hwcfg.irq].used = 1;