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
vserver 1.9.3
[linux-2.6.git]
/
sound
/
oss
/
cs46xx.c
diff --git
a/sound/oss/cs46xx.c
b/sound/oss/cs46xx.c
index
418f976
..
c212b94
100644
(file)
--- a/
sound/oss/cs46xx.c
+++ b/
sound/oss/cs46xx.c
@@
-94,7
+94,6
@@
#include <asm/io.h>
#include <asm/dma.h>
#include <asm/uaccess.h>
#include <asm/io.h>
#include <asm/dma.h>
#include <asm/uaccess.h>
-#include <asm/hardirq.h>
#include "cs46xxpm-24.h"
#include "cs46xx_wrapper-24.h"
#include "cs46xxpm-24.h"
#include "cs46xx_wrapper-24.h"
@@
-2096,7
+2095,7
@@
static ssize_t cs_read(struct file *file, char __user *buffer, size_t count, lof
unsigned copied=0;
CS_DBGOUT(CS_WAVE_READ | CS_FUNCTION, 4,
unsigned copied=0;
CS_DBGOUT(CS_WAVE_READ | CS_FUNCTION, 4,
- printk("cs46xx: cs_read()+ %d\n",count) );
+ printk("cs46xx: cs_read()+ %
z
d\n",count) );
state = (struct cs_state *)card->states[0];
if(!state)
return -ENODEV;
state = (struct cs_state *)card->states[0];
if(!state)
return -ENODEV;
@@
-2157,9
+2156,9
@@
static ssize_t cs_read(struct file *file, char __user *buffer, size_t count, lof
}
CS_DBGOUT(CS_WAVE_READ, 2, printk(KERN_INFO
}
CS_DBGOUT(CS_WAVE_READ, 2, printk(KERN_INFO
- "_read() copy_to cnt=%d count=%d ", cnt,count) );
+ "_read() copy_to cnt=%d count=%
z
d ", cnt,count) );
CS_DBGOUT(CS_WAVE_READ, 8, printk(KERN_INFO
CS_DBGOUT(CS_WAVE_READ, 8, printk(KERN_INFO
- " .dmasize=%d .count=%d buffer=%p ret=%d\n",
+ " .dmasize=%d .count=%d buffer=%p ret=%
z
d\n",
dmabuf->dmasize,dmabuf->count,buffer,ret) );
if (cs_copy_to_user(state, buffer,
dmabuf->dmasize,dmabuf->count,buffer,ret) );
if (cs_copy_to_user(state, buffer,
@@
-2184,7
+2183,7
@@
out2:
up(&state->sem);
set_current_state(TASK_RUNNING);
CS_DBGOUT(CS_WAVE_READ | CS_FUNCTION, 4,
up(&state->sem);
set_current_state(TASK_RUNNING);
CS_DBGOUT(CS_WAVE_READ | CS_FUNCTION, 4,
- printk("cs46xx: cs_read()- %d\n",ret) );
+ printk("cs46xx: cs_read()- %
z
d\n",ret) );
return ret;
}
return ret;
}
@@
-2202,7
+2201,7
@@
static ssize_t cs_write(struct file *file, const char __user *buffer, size_t cou
int cnt;
CS_DBGOUT(CS_WAVE_WRITE | CS_FUNCTION, 4,
int cnt;
CS_DBGOUT(CS_WAVE_WRITE | CS_FUNCTION, 4,
- printk("cs46xx: cs_write called, count = %d\n", count) );
+ printk("cs46xx: cs_write called, count = %
z
d\n", count) );
state = (struct cs_state *)card->states[1];
if(!state)
return -ENODEV;
state = (struct cs_state *)card->states[1];
if(!state)
return -ENODEV;
@@
-2309,7
+2308,7
@@
out:
set_current_state(TASK_RUNNING);
CS_DBGOUT(CS_WAVE_WRITE | CS_FUNCTION, 2,
set_current_state(TASK_RUNNING);
CS_DBGOUT(CS_WAVE_WRITE | CS_FUNCTION, 2,
- printk("cs46xx: cs_write()- ret=
0x%x
\n", ret) );
+ printk("cs46xx: cs_write()- ret=
%zd
\n", ret) );
return ret;
}
return ret;
}