git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
arch
/
m68k
/
mac
/
oss.c
diff --git
a/arch/m68k/mac/oss.c
b/arch/m68k/mac/oss.c
index
3335476
..
6369081
100644
(file)
--- a/
arch/m68k/mac/oss.c
+++ b/
arch/m68k/mac/oss.c
@@
-30,11
+30,11
@@
int oss_present;
volatile struct mac_oss *oss;
int oss_present;
volatile struct mac_oss *oss;
-irqreturn_t oss_irq(int, void *
, struct pt_regs *
);
-irqreturn_t oss_nubus_irq(int, void *
, struct pt_regs *
);
+irqreturn_t oss_irq(int, void *);
+irqreturn_t oss_nubus_irq(int, void *);
-extern irqreturn_t via1_irq(int, void *
, struct pt_regs *
);
-extern irqreturn_t mac_scc_dispatch(int, void *
, struct pt_regs *
);
+extern irqreturn_t via1_irq(int, void *);
+extern irqreturn_t mac_scc_dispatch(int, void *);
/*
* Initialize the OSS
/*
* Initialize the OSS
@@
-67,15
+67,15
@@
void __init oss_init(void)
void __init oss_register_interrupts(void)
{
void __init oss_register_interrupts(void)
{
-
cpu_
request_irq(OSS_IRQLEV_SCSI, oss_irq, IRQ_FLG_LOCK,
+ request_irq(OSS_IRQLEV_SCSI, oss_irq, IRQ_FLG_LOCK,
"scsi", (void *) oss);
"scsi", (void *) oss);
-
cpu_
request_irq(OSS_IRQLEV_IOPSCC, mac_scc_dispatch, IRQ_FLG_LOCK,
+ request_irq(OSS_IRQLEV_IOPSCC, mac_scc_dispatch, IRQ_FLG_LOCK,
"scc", mac_scc_dispatch);
"scc", mac_scc_dispatch);
-
cpu_
request_irq(OSS_IRQLEV_NUBUS, oss_nubus_irq, IRQ_FLG_LOCK,
+ request_irq(OSS_IRQLEV_NUBUS, oss_nubus_irq, IRQ_FLG_LOCK,
"nubus", (void *) oss);
"nubus", (void *) oss);
-
cpu_
request_irq(OSS_IRQLEV_SOUND, oss_irq, IRQ_FLG_LOCK,
+ request_irq(OSS_IRQLEV_SOUND, oss_irq, IRQ_FLG_LOCK,
"sound", (void *) oss);
"sound", (void *) oss);
-
cpu_
request_irq(OSS_IRQLEV_VIA1, via1_irq, IRQ_FLG_LOCK,
+ request_irq(OSS_IRQLEV_VIA1, via1_irq, IRQ_FLG_LOCK,
"via1", (void *) via1);
}
"via1", (void *) via1);
}
@@
-92,7
+92,7
@@
void __init oss_nubus_init(void)
* and SCSI; everything else is routed to its own autovector IRQ.
*/
* and SCSI; everything else is routed to its own autovector IRQ.
*/
-irqreturn_t oss_irq(int irq, void *dev_id
, struct pt_regs *regs
)
+irqreturn_t oss_irq(int irq, void *dev_id)
{
int events;
{
int events;
@@
-113,7
+113,7
@@
irqreturn_t oss_irq(int irq, void *dev_id, struct pt_regs *regs)
oss->irq_pending &= ~OSS_IP_SOUND;
} else if (events & OSS_IP_SCSI) {
oss->irq_level[OSS_SCSI] = OSS_IRQLEV_DISABLED;
oss->irq_pending &= ~OSS_IP_SOUND;
} else if (events & OSS_IP_SCSI) {
oss->irq_level[OSS_SCSI] = OSS_IRQLEV_DISABLED;
- m
ac_do_irq_list(IRQ_MAC_SCSI, regs
);
+ m
68k_handle_int(IRQ_MAC_SCSI
);
oss->irq_pending &= ~OSS_IP_SCSI;
oss->irq_level[OSS_SCSI] = OSS_IRQLEV_SCSI;
} else {
oss->irq_pending &= ~OSS_IP_SCSI;
oss->irq_level[OSS_SCSI] = OSS_IRQLEV_SCSI;
} else {
@@
-128,7
+128,7
@@
irqreturn_t oss_irq(int irq, void *dev_id, struct pt_regs *regs)
* Unlike the VIA/RBV this is on its own autovector interrupt level.
*/
* Unlike the VIA/RBV this is on its own autovector interrupt level.
*/
-irqreturn_t oss_nubus_irq(int irq, void *dev_id
, struct pt_regs *regs
)
+irqreturn_t oss_nubus_irq(int irq, void *dev_id)
{
int events, irq_bit, i;
{
int events, irq_bit, i;
@@
-146,7
+146,7
@@
irqreturn_t oss_nubus_irq(int irq, void *dev_id, struct pt_regs *regs)
for (i = 0, irq_bit = 1 ; i < 6 ; i++, irq_bit <<= 1) {
if (events & irq_bit) {
oss->irq_level[i] = OSS_IRQLEV_DISABLED;
for (i = 0, irq_bit = 1 ; i < 6 ; i++, irq_bit <<= 1) {
if (events & irq_bit) {
oss->irq_level[i] = OSS_IRQLEV_DISABLED;
- m
ac_do_irq_list(NUBUS_SOURCE_BASE + i, regs
);
+ m
68k_handle_int(NUBUS_SOURCE_BASE + i
);
oss->irq_pending &= ~irq_bit;
oss->irq_level[i] = OSS_IRQLEV_NUBUS;
}
oss->irq_pending &= ~irq_bit;
oss->irq_level[i] = OSS_IRQLEV_NUBUS;
}