aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2007-10-29 05:20:44 -0400
committerDavid S. Miller <davem@davemloft.net>2008-01-28 18:03:39 -0500
commit1b36efe07f83ecf50eddd431d067c7bf86318e87 (patch)
tree66cf4be75731dd0d1acf7fee8569a8a019f7718c /drivers/net
parentef878b889907f29af1b5f34734f14eca1aa43cf6 (diff)
hamradio/scc: kill unnecessary use of 'irq' function arg
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/hamradio/scc.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/net/hamradio/scc.c b/drivers/net/hamradio/scc.c
index 353d13e543ce..f90515935833 100644
--- a/drivers/net/hamradio/scc.c
+++ b/drivers/net/hamradio/scc.c
@@ -201,7 +201,6 @@ static void z8530_init(void);
201 201
202static void init_channel(struct scc_channel *scc); 202static void init_channel(struct scc_channel *scc);
203static void scc_key_trx (struct scc_channel *scc, char tx); 203static void scc_key_trx (struct scc_channel *scc, char tx);
204static irqreturn_t scc_isr(int irq, void *dev_id);
205static void scc_init_timer(struct scc_channel *scc); 204static void scc_init_timer(struct scc_channel *scc);
206 205
207static int scc_net_alloc(const char *name, struct scc_channel *scc); 206static int scc_net_alloc(const char *name, struct scc_channel *scc);
@@ -629,6 +628,7 @@ static void scc_isr_dispatch(struct scc_channel *scc, int vector)
629 628
630static irqreturn_t scc_isr(int irq, void *dev_id) 629static irqreturn_t scc_isr(int irq, void *dev_id)
631{ 630{
631 int chip_irq = (long) dev_id;
632 unsigned char vector; 632 unsigned char vector;
633 struct scc_channel *scc; 633 struct scc_channel *scc;
634 struct scc_ctrl *ctrl; 634 struct scc_ctrl *ctrl;
@@ -665,7 +665,7 @@ static irqreturn_t scc_isr(int irq, void *dev_id)
665 ctrl = SCC_ctrl; 665 ctrl = SCC_ctrl;
666 while (ctrl->chan_A) 666 while (ctrl->chan_A)
667 { 667 {
668 if (ctrl->irq != irq) 668 if (ctrl->irq != chip_irq)
669 { 669 {
670 ctrl++; 670 ctrl++;
671 continue; 671 continue;
@@ -1732,7 +1732,9 @@ static int scc_net_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
1732 1732
1733 if (!Ivec[hwcfg.irq].used && hwcfg.irq) 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 printk(KERN_WARNING "z8530drv: warning, cannot get IRQ %d\n", hwcfg.irq); 1738 printk(KERN_WARNING "z8530drv: warning, cannot get IRQ %d\n", hwcfg.irq);
1737 else 1739 else
1738 Ivec[hwcfg.irq].used = 1; 1740 Ivec[hwcfg.irq].used = 1;