diff options
Diffstat (limited to 'drivers/macintosh/via-pmu68k.c')
-rw-r--r-- | drivers/macintosh/via-pmu68k.c | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/drivers/macintosh/via-pmu68k.c b/drivers/macintosh/via-pmu68k.c index 9f4eff1d1a0f..d9986f3a3fbf 100644 --- a/drivers/macintosh/via-pmu68k.c +++ b/drivers/macintosh/via-pmu68k.c | |||
@@ -107,7 +107,7 @@ BLOCKING_NOTIFIER_HEAD(sleep_notifier_list); | |||
107 | static int pmu_probe(void); | 107 | static int pmu_probe(void); |
108 | static int pmu_init(void); | 108 | static int pmu_init(void); |
109 | static void pmu_start(void); | 109 | static void pmu_start(void); |
110 | static irqreturn_t pmu_interrupt(int irq, void *arg, struct pt_regs *regs); | 110 | static irqreturn_t pmu_interrupt(int irq, void *arg); |
111 | static int pmu_send_request(struct adb_request *req, int sync); | 111 | static int pmu_send_request(struct adb_request *req, int sync); |
112 | static int pmu_autopoll(int devs); | 112 | static int pmu_autopoll(int devs); |
113 | void pmu_poll(void); | 113 | void pmu_poll(void); |
@@ -118,8 +118,7 @@ static void pmu_start(void); | |||
118 | static void send_byte(int x); | 118 | static void send_byte(int x); |
119 | static void recv_byte(void); | 119 | static void recv_byte(void); |
120 | static void pmu_done(struct adb_request *req); | 120 | static void pmu_done(struct adb_request *req); |
121 | static void pmu_handle_data(unsigned char *data, int len, | 121 | static void pmu_handle_data(unsigned char *data, int len); |
122 | struct pt_regs *regs); | ||
123 | static void set_volume(int level); | 122 | static void set_volume(int level); |
124 | static void pmu_enable_backlight(int on); | 123 | static void pmu_enable_backlight(int on); |
125 | static void pmu_set_brightness(int level); | 124 | static void pmu_set_brightness(int level); |
@@ -222,7 +221,7 @@ pmu_init(void) | |||
222 | } | 221 | } |
223 | if (pmu_state == idle) { | 222 | if (pmu_state == idle) { |
224 | adb_int_pending = 1; | 223 | adb_int_pending = 1; |
225 | pmu_interrupt(0, NULL, NULL); | 224 | pmu_interrupt(0, NULL); |
226 | } | 225 | } |
227 | pmu_poll(); | 226 | pmu_poll(); |
228 | udelay(10); | 227 | udelay(10); |
@@ -563,17 +562,17 @@ pmu_poll(void) | |||
563 | local_irq_save(flags); | 562 | local_irq_save(flags); |
564 | if (via1[IFR] & SR_INT) { | 563 | if (via1[IFR] & SR_INT) { |
565 | via1[IFR] = SR_INT; | 564 | via1[IFR] = SR_INT; |
566 | pmu_interrupt(IRQ_MAC_ADB_SR, NULL, NULL); | 565 | pmu_interrupt(IRQ_MAC_ADB_SR, NULL); |
567 | } | 566 | } |
568 | if (via1[IFR] & CB1_INT) { | 567 | if (via1[IFR] & CB1_INT) { |
569 | via1[IFR] = CB1_INT; | 568 | via1[IFR] = CB1_INT; |
570 | pmu_interrupt(IRQ_MAC_ADB_CL, NULL, NULL); | 569 | pmu_interrupt(IRQ_MAC_ADB_CL, NULL); |
571 | } | 570 | } |
572 | local_irq_restore(flags); | 571 | local_irq_restore(flags); |
573 | } | 572 | } |
574 | 573 | ||
575 | static irqreturn_t | 574 | static irqreturn_t |
576 | pmu_interrupt(int irq, void *dev_id, struct pt_regs *regs) | 575 | pmu_interrupt(int irq, void *dev_id) |
577 | { | 576 | { |
578 | struct adb_request *req; | 577 | struct adb_request *req; |
579 | int timeout, bite = 0; /* to prevent compiler warning */ | 578 | int timeout, bite = 0; /* to prevent compiler warning */ |
@@ -657,7 +656,7 @@ pmu_interrupt(int irq, void *dev_id, struct pt_regs *regs) | |||
657 | } | 656 | } |
658 | 657 | ||
659 | if (pmu_state == reading_intr) { | 658 | if (pmu_state == reading_intr) { |
660 | pmu_handle_data(interrupt_data, data_index, regs); | 659 | pmu_handle_data(interrupt_data, data_index); |
661 | } else { | 660 | } else { |
662 | req = current_req; | 661 | req = current_req; |
663 | current_req = req->next; | 662 | current_req = req->next; |
@@ -701,7 +700,7 @@ pmu_done(struct adb_request *req) | |||
701 | 700 | ||
702 | /* Interrupt data could be the result data from an ADB cmd */ | 701 | /* Interrupt data could be the result data from an ADB cmd */ |
703 | static void | 702 | static void |
704 | pmu_handle_data(unsigned char *data, int len, struct pt_regs *regs) | 703 | pmu_handle_data(unsigned char *data, int len) |
705 | { | 704 | { |
706 | static int show_pmu_ints = 1; | 705 | static int show_pmu_ints = 1; |
707 | 706 | ||
@@ -726,7 +725,7 @@ pmu_handle_data(unsigned char *data, int len, struct pt_regs *regs) | |||
726 | } | 725 | } |
727 | pmu_done(req); | 726 | pmu_done(req); |
728 | } else { | 727 | } else { |
729 | adb_input(data+1, len-1, regs, 1); | 728 | adb_input(data+1, len-1, 1); |
730 | } | 729 | } |
731 | } else { | 730 | } else { |
732 | if (data[0] == 0x08 && len == 3) { | 731 | if (data[0] == 0x08 && len == 3) { |