diff options
Diffstat (limited to 'drivers/net/skfp/skfddi.c')
-rw-r--r-- | drivers/net/skfp/skfddi.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/drivers/net/skfp/skfddi.c b/drivers/net/skfp/skfddi.c index 8e4d18440a56..9733a11c6146 100644 --- a/drivers/net/skfp/skfddi.c +++ b/drivers/net/skfp/skfddi.c | |||
@@ -101,7 +101,7 @@ static const char * const boot_msg = | |||
101 | static int skfp_driver_init(struct net_device *dev); | 101 | static int skfp_driver_init(struct net_device *dev); |
102 | static int skfp_open(struct net_device *dev); | 102 | static int skfp_open(struct net_device *dev); |
103 | static int skfp_close(struct net_device *dev); | 103 | static int skfp_close(struct net_device *dev); |
104 | static irqreturn_t skfp_interrupt(int irq, void *dev_id, struct pt_regs *regs); | 104 | static irqreturn_t skfp_interrupt(int irq, void *dev_id); |
105 | static struct net_device_stats *skfp_ctl_get_stats(struct net_device *dev); | 105 | static struct net_device_stats *skfp_ctl_get_stats(struct net_device *dev); |
106 | static void skfp_ctl_set_multicast_list(struct net_device *dev); | 106 | static void skfp_ctl_set_multicast_list(struct net_device *dev); |
107 | static void skfp_ctl_set_multicast_list_wo_lock(struct net_device *dev); | 107 | static void skfp_ctl_set_multicast_list_wo_lock(struct net_device *dev); |
@@ -593,7 +593,6 @@ static int skfp_close(struct net_device *dev) | |||
593 | * Arguments: | 593 | * Arguments: |
594 | * irq - interrupt vector | 594 | * irq - interrupt vector |
595 | * dev_id - pointer to device information | 595 | * dev_id - pointer to device information |
596 | * regs - pointer to registers structure | ||
597 | * | 596 | * |
598 | * Functional Description: | 597 | * Functional Description: |
599 | * This routine calls the interrupt processing routine for this adapter. It | 598 | * This routine calls the interrupt processing routine for this adapter. It |
@@ -615,17 +614,12 @@ static int skfp_close(struct net_device *dev) | |||
615 | * Interrupts are disabled, then reenabled at the adapter. | 614 | * Interrupts are disabled, then reenabled at the adapter. |
616 | */ | 615 | */ |
617 | 616 | ||
618 | irqreturn_t skfp_interrupt(int irq, void *dev_id, struct pt_regs *regs) | 617 | irqreturn_t skfp_interrupt(int irq, void *dev_id) |
619 | { | 618 | { |
620 | struct net_device *dev = (struct net_device *) dev_id; | 619 | struct net_device *dev = dev_id; |
621 | struct s_smc *smc; /* private board structure pointer */ | 620 | struct s_smc *smc; /* private board structure pointer */ |
622 | skfddi_priv *bp; | 621 | skfddi_priv *bp; |
623 | 622 | ||
624 | if (dev == NULL) { | ||
625 | printk("%s: irq %d for unknown device\n", dev->name, irq); | ||
626 | return IRQ_NONE; | ||
627 | } | ||
628 | |||
629 | smc = netdev_priv(dev); | 623 | smc = netdev_priv(dev); |
630 | bp = &smc->os; | 624 | bp = &smc->os; |
631 | 625 | ||