aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2007-10-19 02:54:26 -0400
committerJeff Garzik <jeff@garzik.org>2007-10-23 19:53:16 -0400
commit5712cb3d81566893c3b14e24075cf48ec5c35d00 (patch)
tree8258fb24a0c5130e8c0cad16d2d9395941be3ed7 /drivers/net
parentf230d1010ad0dcd71d9ca8ea6864afac49c5aa9b (diff)
[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.c8
-rw-r--r--drivers/net/hamradio/baycom_par.c4
-rw-r--r--drivers/net/plip.c6
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)
325 325
326/* ---------------------------------------------------------------------- */ 326/* ---------------------------------------------------------------------- */
327 327
328static void epp_interrupt(int irq, void *dev_id)
329{
330}
331
332/* ---------------------------------------------------------------------- */
333
334static inline void do_kiss_params(struct baycom_state *bc, 328static inline void do_kiss_params(struct baycom_state *bc,
335 unsigned char *data, unsigned long len) 329 unsigned char *data, unsigned long len)
336{ 330{
@@ -871,7 +865,7 @@ static int epp_open(struct net_device *dev)
871 } 865 }
872 memset(&bc->modem, 0, sizeof(bc->modem)); 866 memset(&bc->modem, 0, sizeof(bc->modem));
873 bc->pdev = parport_register_device(pp, dev->name, NULL, epp_wakeup, 867 bc->pdev = parport_register_device(pp, dev->name, NULL, epp_wakeup,
874 epp_interrupt, PARPORT_DEV_EXCL, dev); 868 NULL, PARPORT_DEV_EXCL, dev);
875 parport_put_port(pp); 869 parport_put_port(pp);
876 if (!bc->pdev) { 870 if (!bc->pdev) {
877 printk(KERN_ERR "%s: cannot register parport at 0x%lx\n", bc_drvname, pp->base); 871 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)
270 270
271/* --------------------------------------------------------------------- */ 271/* --------------------------------------------------------------------- */
272 272
273static void par96_interrupt(int irq, void *dev_id) 273static void par96_interrupt(void *dev_id)
274{ 274{
275 struct net_device *dev = (struct net_device *)dev_id; 275 struct net_device *dev = dev_id;
276 struct baycom_state *bc = netdev_priv(dev); 276 struct baycom_state *bc = netdev_priv(dev);
277 277
278 baycom_int_freq(bc); 278 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);
143static void plip_timer_bh(struct work_struct *work); 143static void plip_timer_bh(struct work_struct *work);
144 144
145/* Interrupt handler */ 145/* Interrupt handler */
146static void plip_interrupt(int irq, void *dev_id); 146static void plip_interrupt(void *dev_id);
147 147
148/* Functions for DEV methods */ 148/* Functions for DEV methods */
149static int plip_tx_packet(struct sk_buff *skb, struct net_device *dev); 149static int plip_tx_packet(struct sk_buff *skb, struct net_device *dev);
@@ -380,7 +380,7 @@ plip_timer_bh(struct work_struct *work)
380 container_of(work, struct net_local, timer.work); 380 container_of(work, struct net_local, timer.work);
381 381
382 if (!(atomic_read (&nl->kill_timer))) { 382 if (!(atomic_read (&nl->kill_timer))) {
383 plip_interrupt (-1, nl->dev); 383 plip_interrupt (nl->dev);
384 384
385 schedule_delayed_work(&nl->timer, 1); 385 schedule_delayed_work(&nl->timer, 1);
386 } 386 }
@@ -897,7 +897,7 @@ plip_error(struct net_device *dev, struct net_local *nl,
897 897
898/* Handle the parallel port interrupts. */ 898/* Handle the parallel port interrupts. */
899static void 899static void
900plip_interrupt(int irq, void *dev_id) 900plip_interrupt(void *dev_id)
901{ 901{
902 struct net_device *dev = dev_id; 902 struct net_device *dev = dev_id;
903 struct net_local *nl; 903 struct net_local *nl;