projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] zd1211rw: Add another ID for Linksys WUSBF54G
[powerpc.git]
/
drivers
/
macintosh
/
via-macii.c
diff --git
a/drivers/macintosh/via-macii.c
b/drivers/macintosh/via-macii.c
index
2a2ffe0
..
1b3bad6
100644
(file)
--- a/
drivers/macintosh/via-macii.c
+++ b/
drivers/macintosh/via-macii.c
@@
-19,7
+19,6
@@
#include <linux/errno.h>
#include <linux/kernel.h>
#include <linux/delay.h>
#include <linux/errno.h>
#include <linux/kernel.h>
#include <linux/delay.h>
-#include <linux/sched.h>
#include <linux/adb.h>
#include <linux/interrupt.h>
#include <linux/init.h>
#include <linux/adb.h>
#include <linux/interrupt.h>
#include <linux/init.h>
@@
-77,7
+76,7
@@
static volatile unsigned char *via;
static int macii_init_via(void);
static void macii_start(void);
static int macii_init_via(void);
static void macii_start(void);
-static irqreturn_t macii_interrupt(int irq, void *arg
, struct pt_regs *regs
);
+static irqreturn_t macii_interrupt(int irq, void *arg);
static void macii_retransmit(int);
static void macii_queue_poll(void);
static void macii_retransmit(int);
static void macii_queue_poll(void);
@@
-107,10
+106,10
@@
static enum macii_state {
awaiting_reply
} macii_state;
awaiting_reply
} macii_state;
-static int need_poll
= 0
;
-static int command_byte
= 0
;
-static int last_reply
= 0
;
-static int last_active
= 0
;
+static int need_poll;
+static int command_byte;
+static int last_reply;
+static int last_active;
static struct adb_request *current_req;
static struct adb_request *last_req;
static struct adb_request *current_req;
static struct adb_request *last_req;
@@
-124,7
+123,7
@@
static int first_byte;
static int prefix_len;
static int status = ST_IDLE|TREQ;
static int last_status;
static int prefix_len;
static int status = ST_IDLE|TREQ;
static int last_status;
-static int driver_running
= 0
;
+static int driver_running;
/* debug level 10 required for ADB logging (should be && debug_adb, ideally) */
/* debug level 10 required for ADB logging (should be && debug_adb, ideally) */
@@
-295,7
+294,7
@@
static void macii_poll(void)
unsigned long flags;
local_irq_save(flags);
unsigned long flags;
local_irq_save(flags);
- if (via[IFR] & SR_INT) macii_interrupt(0, NULL
, NULL
);
+ if (via[IFR] & SR_INT) macii_interrupt(0, NULL);
local_irq_restore(flags);
}
local_irq_restore(flags);
}
@@
-410,7
+409,7
@@
static void macii_start(void)
* Note: As of 21/10/97, the MacII ADB part works including timeout detection
* and retransmit (Talk to the last active device).
*/
* Note: As of 21/10/97, the MacII ADB part works including timeout detection
* and retransmit (Talk to the last active device).
*/
-static irqreturn_t macii_interrupt(int irq, void *arg
, struct pt_regs *regs
)
+static irqreturn_t macii_interrupt(int irq, void *arg)
{
int x, adbdir;
unsigned long flags;
{
int x, adbdir;
unsigned long flags;
@@
-602,8
+601,7
@@
static irqreturn_t macii_interrupt(int irq, void *arg, struct pt_regs *regs)
current_req = req->next;
if (req->done) (*req->done)(req);
} else {
current_req = req->next;
if (req->done) (*req->done)(req);
} else {
- adb_input(reply_buf, reply_ptr - reply_buf,
- regs, 0);
+ adb_input(reply_buf, reply_ptr - reply_buf, 0);
}
/*
}
/*