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
/
sh
/
drivers
/
dma
/
dma-pvr2.c
diff --git
a/arch/sh/drivers/dma/dma-pvr2.c
b/arch/sh/drivers/dma/dma-pvr2.c
index
2e1d58f
..
838fad5
100644
(file)
--- a/
arch/sh/drivers/dma/dma-pvr2.c
+++ b/
arch/sh/drivers/dma/dma-pvr2.c
@@
-1,5
+1,5
@@
/*
/*
- * arch/sh/
boards/dreamcast
/dma-pvr2.c
+ * arch/sh/
drivers/dma
/dma-pvr2.c
*
* NEC PowerVR 2 (Dreamcast) DMA support
*
*
* NEC PowerVR 2 (Dreamcast) DMA support
*
@@
-18,10
+18,10
@@
#include <asm/dma.h>
#include <asm/io.h>
#include <asm/dma.h>
#include <asm/io.h>
-static unsigned int xfer_complete
= 0
;
-static int count
= 0
;
+static unsigned int xfer_complete;
+static int count;
-static irqreturn_t pvr2_dma_interrupt(int irq, void *dev_id
, struct pt_regs *regs
)
+static irqreturn_t pvr2_dma_interrupt(int irq, void *dev_id)
{
if (get_dma_residue(PVR2_CASCADE_CHAN)) {
printk(KERN_WARNING "DMA: SH DMAC did not complete transfer "
{
if (get_dma_residue(PVR2_CASCADE_CHAN)) {
printk(KERN_WARNING "DMA: SH DMAC did not complete transfer "
@@
-70,7
+70,7
@@
static int pvr2_xfer_dma(struct dma_channel *chan)
static struct irqaction pvr2_dma_irq = {
.name = "pvr2 DMA handler",
.handler = pvr2_dma_interrupt,
static struct irqaction pvr2_dma_irq = {
.name = "pvr2 DMA handler",
.handler = pvr2_dma_interrupt,
- .flags =
SA_INTERRUPT
,
+ .flags =
IRQF_DISABLED
,
};
static struct dma_ops pvr2_dma_ops = {
};
static struct dma_ops pvr2_dma_ops = {
@@
-80,7
+80,7
@@
static struct dma_ops pvr2_dma_ops = {
};
static struct dma_info pvr2_dma_info = {
};
static struct dma_info pvr2_dma_info = {
- .name = "
PowerVR 2 DMA
",
+ .name = "
pvr2_dmac
",
.nr_channels = 1,
.ops = &pvr2_dma_ops,
.flags = DMAC_CHANNELS_TEI_CAPABLE,
.nr_channels = 1,
.ops = &pvr2_dma_ops,
.flags = DMAC_CHANNELS_TEI_CAPABLE,
@@
-98,6
+98,7
@@
static void __exit pvr2_dma_exit(void)
{
free_dma(PVR2_CASCADE_CHAN);
free_irq(HW_EVENT_PVR2_DMA, 0);
{
free_dma(PVR2_CASCADE_CHAN);
free_irq(HW_EVENT_PVR2_DMA, 0);
+ unregister_dmac(&pvr2_dma_info);
}
subsys_initcall(pvr2_dma_init);
}
subsys_initcall(pvr2_dma_init);
@@
-106,4
+107,3
@@
module_exit(pvr2_dma_exit);
MODULE_AUTHOR("Paul Mundt <lethal@linux-sh.org>");
MODULE_DESCRIPTION("NEC PowerVR 2 DMA driver");
MODULE_LICENSE("GPL");
MODULE_AUTHOR("Paul Mundt <lethal@linux-sh.org>");
MODULE_DESCRIPTION("NEC PowerVR 2 DMA driver");
MODULE_LICENSE("GPL");
-