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
/
arm
/
mach-pxa
/
dma.c
diff --git
a/arch/arm/mach-pxa/dma.c
b/arch/arm/mach-pxa/dma.c
index
7d8c854
..
4440bab
100644
(file)
--- a/
arch/arm/mach-pxa/dma.c
+++ b/
arch/arm/mach-pxa/dma.c
@@
-27,13
+27,13
@@
static struct dma_channel {
char *name;
static struct dma_channel {
char *name;
- void (*irq_handler)(int, void *
, struct pt_regs *
);
+ void (*irq_handler)(int, void *);
void *data;
} dma_channels[PXA_DMA_CHANNELS];
int pxa_request_dma (char *name, pxa_dma_prio prio,
void *data;
} dma_channels[PXA_DMA_CHANNELS];
int pxa_request_dma (char *name, pxa_dma_prio prio,
- void (*irq_handler)(int, void *
, struct pt_regs *
),
+ void (*irq_handler)(int, void *),
void *data)
{
unsigned long flags;
void *data)
{
unsigned long flags;
@@
-87,7
+87,7
@@
void pxa_free_dma (int dma_ch)
local_irq_restore(flags);
}
local_irq_restore(flags);
}
-static irqreturn_t dma_irq_handler(int irq, void *dev_id
, struct pt_regs *regs
)
+static irqreturn_t dma_irq_handler(int irq, void *dev_id)
{
int i, dint = DINT;
{
int i, dint = DINT;
@@
-95,7
+95,7
@@
static irqreturn_t dma_irq_handler(int irq, void *dev_id, struct pt_regs *regs)
if (dint & (1 << i)) {
struct dma_channel *channel = &dma_channels[i];
if (channel->name && channel->irq_handler) {
if (dint & (1 << i)) {
struct dma_channel *channel = &dma_channels[i];
if (channel->name && channel->irq_handler) {
- channel->irq_handler(i, channel->data
, regs
);
+ channel->irq_handler(i, channel->data);
} else {
/*
* IRQ for an unregistered DMA channel:
} else {
/*
* IRQ for an unregistered DMA channel: