Commit 5712cb3d authored by Jeff Garzik's avatar Jeff Garzik
Browse files

[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: default avatarJeff Garzik <jgarzik@redhat.com>
parent f230d101

drivers/char/ppdev.c

+2 −2
Original line number Diff line number Diff line
@@ -267,9 +267,9 @@ static ssize_t pp_write (struct file * file, const char __user * buf, 
	return bytes_written;

}



static void pp_irq (int irq, void * private)

static void pp_irq (void *private)

{

	struct pp_struct * pp = (struct pp_struct *) private;

	struct pp_struct *pp = private;



	if (pp->irqresponse) {

		parport_write_control (pp->pdev->port, pp->irqctl);

drivers/input/serio/parkbd.c

+1 −1
Original line number Diff line number Diff line
@@ -102,7 +102,7 @@ static int parkbd_write(struct serio *port, unsigned char c) 
	return 0;

}



static void parkbd_interrupt(int irq, void *dev_id)

static void parkbd_interrupt(void *dev_id)

{



	if (parkbd_writing) {

drivers/net/hamradio/baycom_epp.c

+1 −7
Original line number Diff line number Diff line
@@ -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);

drivers/net/hamradio/baycom_par.c

+2 −2
Original line number Diff line number Diff line
@@ -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);

drivers/net/plip.c

+3 −3
Original line number Diff line number Diff line
@@ -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;