diff options
Diffstat (limited to 'include/linux/parport.h')
| -rw-r--r-- | include/linux/parport.h | 16 | 
1 files changed, 7 insertions, 9 deletions
diff --git a/include/linux/parport.h b/include/linux/parport.h index 5bf321e82c9..80682aaa8f1 100644 --- a/include/linux/parport.h +++ b/include/linux/parport.h @@ -229,7 +229,7 @@ struct pardevice {  	int (*preempt)(void *);  	void (*wakeup)(void *);  	void *private; -	void (*irq_func)(int, void *, struct pt_regs *); +	void (*irq_func)(int, void *);  	unsigned int flags;  	struct pardevice *next;  	struct pardevice *prev; @@ -375,7 +375,7 @@ extern void parport_put_port (struct parport *);  struct pardevice *parport_register_device(struct parport *port,   			  const char *name,  			  int (*pf)(void *), void (*kf)(void *), -			  void (*irq_func)(int, void *, struct pt_regs *),  +			  void (*irq_func)(int, void *),   			  int flags, void *handle);  /* parport_unregister unlinks a device from the chain. */ @@ -457,7 +457,7 @@ static __inline__ int parport_yield_blocking(struct pardevice *dev)  #define PARPORT_FLAG_EXCL		(1<<1)	/* EXCL driver registered. */  /* IEEE1284 functions */ -extern void parport_ieee1284_interrupt (int, void *, struct pt_regs *); +extern void parport_ieee1284_interrupt (int, void *);  extern int parport_negotiate (struct parport *, int mode);  extern ssize_t parport_write (struct parport *, const void *buf, size_t len);  extern ssize_t parport_read (struct parport *, void *buf, size_t len); @@ -502,8 +502,7 @@ extern void parport_daisy_fini (struct parport *port);  extern struct pardevice *parport_open (int devnum, const char *name,  				       int (*pf) (void *),  				       void (*kf) (void *), -				       void (*irqf) (int, void *, -						     struct pt_regs *), +				       void (*irqf) (int, void *),  				       int flags, void *handle);  extern void parport_close (struct pardevice *dev);  extern ssize_t parport_device_id (int devnum, char *buffer, size_t len); @@ -512,13 +511,12 @@ extern void parport_daisy_deselect_all (struct parport *port);  extern int parport_daisy_select (struct parport *port, int daisy, int mode);  /* Lowlevel drivers _can_ call this support function to handle irqs.  */ -static __inline__ void parport_generic_irq(int irq, struct parport *port, -					   struct pt_regs *regs) +static __inline__ void parport_generic_irq(int irq, struct parport *port)  { -	parport_ieee1284_interrupt (irq, port, regs); +	parport_ieee1284_interrupt (irq, port);  	read_lock(&port->cad_lock);  	if (port->cad && port->cad->irq_func) -		port->cad->irq_func(irq, port->cad->private, regs); +		port->cad->irq_func(irq, port->cad->private);  	read_unlock(&port->cad_lock);  }  |