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
/
atari
/
stdma.c
diff --git
a/arch/m68k/atari/stdma.c
b/arch/m68k/atari/stdma.c
index
288f5e6
..
d01deb4
100644
(file)
--- a/
arch/m68k/atari/stdma.c
+++ b/
arch/m68k/atari/stdma.c
@@
-44,7
+44,7
@@
static int stdma_locked; /* the semaphore */
/* int func to be called */
static int stdma_locked; /* the semaphore */
/* int func to be called */
-static irq
return_t (*stdma_isr)(int, void *, struct pt_regs *)
;
+static irq
_handler_t stdma_isr
;
static void *stdma_isr_data; /* data passed to isr */
static DECLARE_WAIT_QUEUE_HEAD(stdma_wait); /* wait queue for ST-DMA */
static void *stdma_isr_data; /* data passed to isr */
static DECLARE_WAIT_QUEUE_HEAD(stdma_wait); /* wait queue for ST-DMA */
@@
-53,7
+53,7
@@
static DECLARE_WAIT_QUEUE_HEAD(stdma_wait); /* wait queue for ST-DMA */
/***************************** Prototypes *****************************/
/***************************** Prototypes *****************************/
-static irqreturn_t stdma_int (int irq, void *dummy
, struct pt_regs *fp
);
+static irqreturn_t stdma_int (int irq, void *dummy);
/************************* End of Prototypes **************************/
/************************* End of Prototypes **************************/
@@
-75,8
+75,7
@@
static irqreturn_t stdma_int (int irq, void *dummy, struct pt_regs *fp);
*
*/
*
*/
-void stdma_lock(irqreturn_t (*handler)(int, void *, struct pt_regs *),
- void *data)
+void stdma_lock(irq_handler_t handler, void *data)
{
unsigned long flags;
{
unsigned long flags;
@@
-175,7
+174,7
@@
int stdma_islocked(void)
void __init stdma_init(void)
{
stdma_isr = NULL;
void __init stdma_init(void)
{
stdma_isr = NULL;
- request_irq(IRQ_MFP_FDC, stdma_int, IRQ_TYPE_SLOW,
+ request_irq(IRQ_MFP_FDC, stdma_int, IRQ_TYPE_SLOW
| SA_SHIRQ
,
"ST-DMA: floppy/ACSI/IDE/Falcon-SCSI", stdma_int);
}
"ST-DMA: floppy/ACSI/IDE/Falcon-SCSI", stdma_int);
}
@@
-188,9
+187,9
@@
void __init stdma_init(void)
*
*/
*
*/
-static irqreturn_t stdma_int(int irq, void *dummy
, struct pt_regs *fp
)
+static irqreturn_t stdma_int(int irq, void *dummy)
{
if (stdma_isr)
{
if (stdma_isr)
- (*stdma_isr)(irq, stdma_isr_data
, fp
);
+ (*stdma_isr)(irq, stdma_isr_data);
return IRQ_HANDLED;
}
return IRQ_HANDLED;
}