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
linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git]
/
sound
/
pci
/
au88x0
/
au88x0_core.c
diff --git
a/sound/pci/au88x0/au88x0_core.c
b/sound/pci/au88x0/au88x0_core.c
index
4347e6a
..
e3394fe
100644
(file)
--- a/
sound/pci/au88x0/au88x0_core.c
+++ b/
sound/pci/au88x0/au88x0_core.c
@@
-376,7
+376,7
@@
vortex_mixer_delWTD(vortex_t * vortex, unsigned char mix, unsigned char ch)
static void vortex_mixer_init(vortex_t * vortex)
{
static void vortex_mixer_init(vortex_t * vortex)
{
- u
32
addr;
+ u
nsigned long
addr;
int x;
// FIXME: get rid of this crap.
int x;
// FIXME: get rid of this crap.
@@
-639,7
+639,7
@@
static void vortex_src_setupchannel(vortex_t * card, unsigned char src,
static void vortex_srcblock_init(vortex_t * vortex)
{
static void vortex_srcblock_init(vortex_t * vortex)
{
- u
32
addr;
+ u
nsigned long
addr;
int x;
hwwrite(vortex->mmio, VORTEX_SRC_SOURCESIZE, 0x1ff);
/*
int x;
hwwrite(vortex->mmio, VORTEX_SRC_SOURCESIZE, 0x1ff);
/*
@@
-1035,7
+1035,7
@@
vortex_fifo_setwtctrl(vortex_t * vortex, int fifo, int ctrl, int priority,
static void vortex_fifo_init(vortex_t * vortex)
{
int x;
static void vortex_fifo_init(vortex_t * vortex)
{
int x;
- u
32
addr;
+ u
nsigned long
addr;
/* ADB DMA channels fifos. */
addr = VORTEX_FIFO_ADBCTRL + ((NR_ADB - 1) * 4);
/* ADB DMA channels fifos. */
addr = VORTEX_FIFO_ADBCTRL + ((NR_ADB - 1) * 4);
@@
-1054,7
+1054,7
@@
static void vortex_fifo_init(vortex_t * vortex)
hwwrite(vortex->mmio, addr, FIFO_U0);
if (hwread(vortex->mmio, addr) != FIFO_U0)
printk(KERN_ERR
hwwrite(vortex->mmio, addr, FIFO_U0);
if (hwread(vortex->mmio, addr) != FIFO_U0)
printk(KERN_ERR
- "bad wt fifo reset (0x%08x, 0x%08x)!\n",
+ "bad wt fifo reset (0x%08
l
x, 0x%08x)!\n",
addr, hwread(vortex->mmio, addr));
vortex_fifo_clearwtdata(vortex, x, FIFO_SIZE);
addr -= 4;
addr, hwread(vortex->mmio, addr));
vortex_fifo_clearwtdata(vortex, x, FIFO_SIZE);
addr -= 4;
@@
-1152,7
+1152,7
@@
vortex_adbdma_setbuffers(vortex_t * vortex, int adbdma,
static void
vortex_adbdma_setmode(vortex_t * vortex, int adbdma, int ie, int dir,
static void
vortex_adbdma_setmode(vortex_t * vortex, int adbdma, int ie, int dir,
- int fmt, int d, u
32
offset)
+ int fmt, int d, u
nsigned long
offset)
{
stream_t *dma = &vortex->dma_adb[adbdma];
{
stream_t *dma = &vortex->dma_adb[adbdma];
@@
-1411,7
+1411,7
@@
vortex_wtdma_setbuffers(vortex_t * vortex, int wtdma,
static void
vortex_wtdma_setmode(vortex_t * vortex, int wtdma, int ie, int fmt, int d,
static void
vortex_wtdma_setmode(vortex_t * vortex, int wtdma, int ie, int fmt, int d,
- /*int e, */ u
32
offset)
+ /*int e, */ u
nsigned long
offset)
{
stream_t *dma = &vortex->dma_wt[wtdma];
{
stream_t *dma = &vortex->dma_wt[wtdma];
@@
-2658,7
+2658,7
@@
static void vortex_spdif_init(vortex_t * vortex, int spdif_sr, int spdif_mode)
/* Initialization */
/* Initialization */
-static int
__devinit
vortex_core_init(vortex_t * vortex)
+static int vortex_core_init(vortex_t * vortex)
{
printk(KERN_INFO "Vortex: init.... ");
{
printk(KERN_INFO "Vortex: init.... ");