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 5bf321e82c99..80682aaa8f18 100644 --- a/include/linux/parport.h +++ b/include/linux/parport.h | |||
@@ -229,7 +229,7 @@ struct pardevice { | |||
229 | int (*preempt)(void *); | 229 | int (*preempt)(void *); |
230 | void (*wakeup)(void *); | 230 | void (*wakeup)(void *); |
231 | void *private; | 231 | void *private; |
232 | void (*irq_func)(int, void *, struct pt_regs *); | 232 | void (*irq_func)(int, void *); |
233 | unsigned int flags; | 233 | unsigned int flags; |
234 | struct pardevice *next; | 234 | struct pardevice *next; |
235 | struct pardevice *prev; | 235 | struct pardevice *prev; |
@@ -375,7 +375,7 @@ extern void parport_put_port (struct parport *); | |||
375 | struct pardevice *parport_register_device(struct parport *port, | 375 | struct pardevice *parport_register_device(struct parport *port, |
376 | const char *name, | 376 | const char *name, |
377 | int (*pf)(void *), void (*kf)(void *), | 377 | int (*pf)(void *), void (*kf)(void *), |
378 | void (*irq_func)(int, void *, struct pt_regs *), | 378 | void (*irq_func)(int, void *), |
379 | int flags, void *handle); | 379 | int flags, void *handle); |
380 | 380 | ||
381 | /* parport_unregister unlinks a device from the chain. */ | 381 | /* parport_unregister unlinks a device from the chain. */ |
@@ -457,7 +457,7 @@ static __inline__ int parport_yield_blocking(struct pardevice *dev) | |||
457 | #define PARPORT_FLAG_EXCL (1<<1) /* EXCL driver registered. */ | 457 | #define PARPORT_FLAG_EXCL (1<<1) /* EXCL driver registered. */ |
458 | 458 | ||
459 | /* IEEE1284 functions */ | 459 | /* IEEE1284 functions */ |
460 | extern void parport_ieee1284_interrupt (int, void *, struct pt_regs *); | 460 | extern void parport_ieee1284_interrupt (int, void *); |
461 | extern int parport_negotiate (struct parport *, int mode); | 461 | extern int parport_negotiate (struct parport *, int mode); |
462 | extern ssize_t parport_write (struct parport *, const void *buf, size_t len); | 462 | extern ssize_t parport_write (struct parport *, const void *buf, size_t len); |
463 | extern ssize_t parport_read (struct parport *, void *buf, size_t len); | 463 | extern ssize_t parport_read (struct parport *, void *buf, size_t len); |
@@ -502,8 +502,7 @@ extern void parport_daisy_fini (struct parport *port); | |||
502 | extern struct pardevice *parport_open (int devnum, const char *name, | 502 | extern struct pardevice *parport_open (int devnum, const char *name, |
503 | int (*pf) (void *), | 503 | int (*pf) (void *), |
504 | void (*kf) (void *), | 504 | void (*kf) (void *), |
505 | void (*irqf) (int, void *, | 505 | void (*irqf) (int, void *), |
506 | struct pt_regs *), | ||
507 | int flags, void *handle); | 506 | int flags, void *handle); |
508 | extern void parport_close (struct pardevice *dev); | 507 | extern void parport_close (struct pardevice *dev); |
509 | extern ssize_t parport_device_id (int devnum, char *buffer, size_t len); | 508 | 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); | |||
512 | extern int parport_daisy_select (struct parport *port, int daisy, int mode); | 511 | extern int parport_daisy_select (struct parport *port, int daisy, int mode); |
513 | 512 | ||
514 | /* Lowlevel drivers _can_ call this support function to handle irqs. */ | 513 | /* Lowlevel drivers _can_ call this support function to handle irqs. */ |
515 | static __inline__ void parport_generic_irq(int irq, struct parport *port, | 514 | static __inline__ void parport_generic_irq(int irq, struct parport *port) |
516 | struct pt_regs *regs) | ||
517 | { | 515 | { |
518 | parport_ieee1284_interrupt (irq, port, regs); | 516 | parport_ieee1284_interrupt (irq, port); |
519 | read_lock(&port->cad_lock); | 517 | read_lock(&port->cad_lock); |
520 | if (port->cad && port->cad->irq_func) | 518 | if (port->cad && port->cad->irq_func) |
521 | port->cad->irq_func(irq, port->cad->private, regs); | 519 | port->cad->irq_func(irq, port->cad->private); |
522 | read_unlock(&port->cad_lock); | 520 | read_unlock(&port->cad_lock); |
523 | } | 521 | } |
524 | 522 | ||