diff options
| author | Jeff Garzik <jeff@garzik.org> | 2007-10-19 10:54:26 +0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2007-10-24 03:53:16 +0400 |
| commit | 5712cb3d81566893c3b14e24075cf48ec5c35d00 (patch) | |
| tree | 8258fb24a0c5130e8c0cad16d2d9395941be3ed7 /drivers/net | |
| parent | f230d1010ad0dcd71d9ca8ea6864afac49c5aa9b (diff) | |
| download | linux-5712cb3d81566893c3b14e24075cf48ec5c35d00.tar.xz | |
[PARPORT] Remove unused 'irq' argument from parport irq functions
None of the drivers with a struct pardevice's ->irq_func() hook ever
used the 'irq' argument passed to it, so remove it.
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/hamradio/baycom_epp.c | 8 | ||||
| -rw-r--r-- | drivers/net/hamradio/baycom_par.c | 4 | ||||
| -rw-r--r-- | drivers/net/plip.c | 6 |
3 files changed, 6 insertions, 12 deletions
diff --git a/drivers/net/hamradio/baycom_epp.c b/drivers/net/hamradio/baycom_epp.c index 1a5a75acf73e..dde9c7e6408a 100644 --- a/drivers/net/hamradio/baycom_epp.c +++ b/drivers/net/hamradio/baycom_epp.c @@ -325,12 +325,6 @@ static int eppconfig(struct baycom_state *bc) /* ---------------------------------------------------------------------- */ -static void epp_interrupt(int irq, void *dev_id) -{ -} - -/* ---------------------------------------------------------------------- */ - static inline void do_kiss_params(struct baycom_state *bc, unsigned char *data, unsigned long len) { @@ -871,7 +865,7 @@ static int epp_open(struct net_device *dev) } memset(&bc->modem, 0, sizeof(bc->modem)); bc->pdev = parport_register_device(pp, dev->name, NULL, epp_wakeup, - epp_interrupt, PARPORT_DEV_EXCL, dev); + NULL, PARPORT_DEV_EXCL, dev); parport_put_port(pp); if (!bc->pdev) { printk(KERN_ERR "%s: cannot register parport at 0x%lx\n", bc_drvname, pp->base); diff --git a/drivers/net/hamradio/baycom_par.c b/drivers/net/hamradio/baycom_par.c index 5930aeb35015..2e6fc4dc74b1 100644 --- a/drivers/net/hamradio/baycom_par.c +++ b/drivers/net/hamradio/baycom_par.c @@ -270,9 +270,9 @@ static __inline__ void par96_rx(struct net_device *dev, struct baycom_state *bc) /* --------------------------------------------------------------------- */ -static void par96_interrupt(int irq, void *dev_id) +static void par96_interrupt(void *dev_id) { - struct net_device *dev = (struct net_device *)dev_id; + struct net_device *dev = dev_id; struct baycom_state *bc = netdev_priv(dev); baycom_int_freq(bc); diff --git a/drivers/net/plip.c b/drivers/net/plip.c index b5e9981d1060..5071fcd8a0bd 100644 --- a/drivers/net/plip.c +++ b/drivers/net/plip.c @@ -143,7 +143,7 @@ static void plip_bh(struct work_struct *work); static void plip_timer_bh(struct work_struct *work); /* Interrupt handler */ -static void plip_interrupt(int irq, void *dev_id); +static void plip_interrupt(void *dev_id); /* Functions for DEV methods */ static int plip_tx_packet(struct sk_buff *skb, struct net_device *dev); @@ -380,7 +380,7 @@ plip_timer_bh(struct work_struct *work) container_of(work, struct net_local, timer.work); if (!(atomic_read (&nl->kill_timer))) { - plip_interrupt (-1, nl->dev); + plip_interrupt (nl->dev); schedule_delayed_work(&nl->timer, 1); } @@ -897,7 +897,7 @@ plip_error(struct net_device *dev, struct net_local *nl, /* Handle the parallel port interrupts. */ static void -plip_interrupt(int irq, void *dev_id) +plip_interrupt(void *dev_id) { struct net_device *dev = dev_id; struct net_local *nl; |