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 kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
sound
/
drivers
/
opl4
/
opl4_proc.c
diff --git
a/sound/drivers/opl4/opl4_proc.c
b/sound/drivers/opl4/opl4_proc.c
index
bbea9ab
..
e552ec3
100644
(file)
--- a/
sound/drivers/opl4/opl4_proc.c
+++ b/
sound/drivers/opl4/opl4_proc.c
@@
-23,37
+23,37
@@
#ifdef CONFIG_PROC_FS
#ifdef CONFIG_PROC_FS
-static int snd_opl4_mem_proc_open(s
nd_info_entry_t
*entry,
+static int snd_opl4_mem_proc_open(s
truct snd_info_entry
*entry,
unsigned short mode, void **file_private_data)
{
unsigned short mode, void **file_private_data)
{
-
opl4_t *opl4 = snd_magic_cast(opl4_t, entry->private_data, return -ENXIO)
;
+
struct snd_opl4 *opl4 = entry->private_data
;
-
down
(&opl4->access_mutex);
+
mutex_lock
(&opl4->access_mutex);
if (opl4->memory_access) {
if (opl4->memory_access) {
-
up
(&opl4->access_mutex);
+
mutex_unlock
(&opl4->access_mutex);
return -EBUSY;
}
opl4->memory_access++;
return -EBUSY;
}
opl4->memory_access++;
-
up
(&opl4->access_mutex);
+
mutex_unlock
(&opl4->access_mutex);
return 0;
}
return 0;
}
-static int snd_opl4_mem_proc_release(s
nd_info_entry_t
*entry,
+static int snd_opl4_mem_proc_release(s
truct snd_info_entry
*entry,
unsigned short mode, void *file_private_data)
{
unsigned short mode, void *file_private_data)
{
-
opl4_t *opl4 = snd_magic_cast(opl4_t, entry->private_data, return -ENXIO)
;
+
struct snd_opl4 *opl4 = entry->private_data
;
-
down
(&opl4->access_mutex);
+
mutex_lock
(&opl4->access_mutex);
opl4->memory_access--;
opl4->memory_access--;
-
up
(&opl4->access_mutex);
+
mutex_unlock
(&opl4->access_mutex);
return 0;
}
return 0;
}
-static long snd_opl4_mem_proc_read(s
nd_info_entry_t
*entry, void *file_private_data,
+static long snd_opl4_mem_proc_read(s
truct snd_info_entry
*entry, void *file_private_data,
struct file *file, char __user *_buf,
unsigned long count, unsigned long pos)
{
struct file *file, char __user *_buf,
unsigned long count, unsigned long pos)
{
-
opl4_t *opl4 = snd_magic_cast(opl4_t, entry->private_data, return -ENXIO)
;
+
struct snd_opl4 *opl4 = entry->private_data
;
long size;
char* buf;
long size;
char* buf;
@@
-75,11
+75,11
@@
static long snd_opl4_mem_proc_read(snd_info_entry_t *entry, void *file_private_d
return 0;
}
return 0;
}
-static long snd_opl4_mem_proc_write(s
nd_info_entry_t
*entry, void *file_private_data,
+static long snd_opl4_mem_proc_write(s
truct snd_info_entry
*entry, void *file_private_data,
struct file *file, const char __user *_buf,
unsigned long count, unsigned long pos)
{
struct file *file, const char __user *_buf,
unsigned long count, unsigned long pos)
{
-
opl4_t *opl4 = snd_magic_cast(opl4_t, entry->private_data, return -ENXIO)
;
+
struct snd_opl4 *opl4 = entry->private_data
;
long size;
char *buf;
long size;
char *buf;
@@
-101,7
+101,7
@@
static long snd_opl4_mem_proc_write(snd_info_entry_t *entry, void *file_private_
return 0;
}
return 0;
}
-static long long snd_opl4_mem_proc_llseek(s
nd_info_entry_t
*entry, void *file_private_data,
+static long long snd_opl4_mem_proc_llseek(s
truct snd_info_entry
*entry, void *file_private_data,
struct file *file, long long offset, int orig)
{
switch (orig) {
struct file *file, long long offset, int orig)
{
switch (orig) {
@@
-130,9
+130,9
@@
static struct snd_info_entry_ops snd_opl4_mem_proc_ops = {
.llseek = snd_opl4_mem_proc_llseek,
};
.llseek = snd_opl4_mem_proc_llseek,
};
-int snd_opl4_create_proc(
opl4_t
*opl4)
+int snd_opl4_create_proc(
struct snd_opl4
*opl4)
{
{
- s
nd_info_entry_t
*entry;
+ s
truct snd_info_entry
*entry;
entry = snd_info_create_card_entry(opl4->card, "opl4-mem", opl4->card->proc_root);
if (entry) {
entry = snd_info_create_card_entry(opl4->card, "opl4-mem", opl4->card->proc_root);
if (entry) {
@@
-157,7
+157,7
@@
int snd_opl4_create_proc(opl4_t *opl4)
return 0;
}
return 0;
}
-void snd_opl4_free_proc(
opl4_t
*opl4)
+void snd_opl4_free_proc(
struct snd_opl4
*opl4)
{
if (opl4->proc_entry)
snd_info_unregister(opl4->proc_entry);
{
if (opl4->proc_entry)
snd_info_unregister(opl4->proc_entry);