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-pnx4008
/
dma.c
diff --git
a/arch/arm/mach-pnx4008/dma.c
b/arch/arm/mach-pnx4008/dma.c
index
ec01574
..
d6a279e
100644
(file)
--- a/
arch/arm/mach-pnx4008/dma.c
+++ b/
arch/arm/mach-pnx4008/dma.c
@@
-32,7
+32,7
@@
static struct dma_channel {
char *name;
static struct dma_channel {
char *name;
- void (*irq_handler) (int, int, void *
, struct pt_regs *
);
+ void (*irq_handler) (int, int, void *);
void *data;
struct pnx4008_dma_ll *ll;
u32 ll_dma;
void *data;
struct pnx4008_dma_ll *ll;
u32 ll_dma;
@@
-150,8
+150,7
@@
static inline void pnx4008_dma_unlock(void)
#define VALID_CHANNEL(c) (((c) >= 0) && ((c) < MAX_DMA_CHANNELS))
int pnx4008_request_channel(char *name, int ch,
#define VALID_CHANNEL(c) (((c) >= 0) && ((c) < MAX_DMA_CHANNELS))
int pnx4008_request_channel(char *name, int ch,
- void (*irq_handler) (int, int, void *,
- struct pt_regs *), void *data)
+ void (*irq_handler) (int, int, void *), void *data)
{
int i, found = 0;
{
int i, found = 0;
@@
-1033,7
+1032,7
@@
int pnx4008_dma_ch_enabled(int ch)
EXPORT_SYMBOL_GPL(pnx4008_dma_ch_enabled);
EXPORT_SYMBOL_GPL(pnx4008_dma_ch_enabled);
-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;
unsigned long dint = __raw_readl(DMAC_INT_STAT);
{
int i;
unsigned long dint = __raw_readl(DMAC_INT_STAT);
@@
-1053,8
+1052,7
@@
static irqreturn_t dma_irq_handler(int irq, void *dev_id, struct pt_regs *regs)
cause |= DMA_ERR_INT;
if (tcint & i_bit)
cause |= DMA_TC_INT;
cause |= DMA_ERR_INT;
if (tcint & i_bit)
cause |= DMA_TC_INT;
- channel->irq_handler(i, cause, channel->data,
- regs);
+ channel->irq_handler(i, cause, channel->data);
} else {
/*
* IRQ for an unregistered DMA channel
} else {
/*
* IRQ for an unregistered DMA channel