diff options
Diffstat (limited to 'drivers/macintosh/adb.c')
-rw-r--r-- | drivers/macintosh/adb.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/macintosh/adb.c b/drivers/macintosh/adb.c index 360f93f6fcdb..be0bd34ff6f9 100644 --- a/drivers/macintosh/adb.c +++ b/drivers/macintosh/adb.c | |||
@@ -103,7 +103,7 @@ static void adbdev_init(void); | |||
103 | static int try_handler_change(int, int); | 103 | static int try_handler_change(int, int); |
104 | 104 | ||
105 | static struct adb_handler { | 105 | static struct adb_handler { |
106 | void (*handler)(unsigned char *, int, struct pt_regs *, int); | 106 | void (*handler)(unsigned char *, int, int); |
107 | int original_address; | 107 | int original_address; |
108 | int handler_id; | 108 | int handler_id; |
109 | int busy; | 109 | int busy; |
@@ -522,7 +522,7 @@ bail: | |||
522 | the handler_id id it doesn't match. */ | 522 | the handler_id id it doesn't match. */ |
523 | int | 523 | int |
524 | adb_register(int default_id, int handler_id, struct adb_ids *ids, | 524 | adb_register(int default_id, int handler_id, struct adb_ids *ids, |
525 | void (*handler)(unsigned char *, int, struct pt_regs *, int)) | 525 | void (*handler)(unsigned char *, int, int)) |
526 | { | 526 | { |
527 | int i; | 527 | int i; |
528 | 528 | ||
@@ -570,13 +570,13 @@ adb_unregister(int index) | |||
570 | } | 570 | } |
571 | 571 | ||
572 | void | 572 | void |
573 | adb_input(unsigned char *buf, int nb, struct pt_regs *regs, int autopoll) | 573 | adb_input(unsigned char *buf, int nb, int autopoll) |
574 | { | 574 | { |
575 | int i, id; | 575 | int i, id; |
576 | static int dump_adb_input = 0; | 576 | static int dump_adb_input = 0; |
577 | unsigned long flags; | 577 | unsigned long flags; |
578 | 578 | ||
579 | void (*handler)(unsigned char *, int, struct pt_regs *, int); | 579 | void (*handler)(unsigned char *, int, int); |
580 | 580 | ||
581 | /* We skip keystrokes and mouse moves when the sleep process | 581 | /* We skip keystrokes and mouse moves when the sleep process |
582 | * has been started. We stop autopoll, but this is another security | 582 | * has been started. We stop autopoll, but this is another security |
@@ -597,7 +597,7 @@ adb_input(unsigned char *buf, int nb, struct pt_regs *regs, int autopoll) | |||
597 | adb_handler[id].busy = 1; | 597 | adb_handler[id].busy = 1; |
598 | write_unlock_irqrestore(&adb_handler_lock, flags); | 598 | write_unlock_irqrestore(&adb_handler_lock, flags); |
599 | if (handler != NULL) { | 599 | if (handler != NULL) { |
600 | (*handler)(buf, nb, regs, autopoll); | 600 | (*handler)(buf, nb, autopoll); |
601 | wmb(); | 601 | wmb(); |
602 | adb_handler[id].busy = 0; | 602 | adb_handler[id].busy = 0; |
603 | } | 603 | } |