aboutsummaryrefslogtreecommitdiffstats
path: root/sound/drivers/opl4/opl4_proc.c
diff options
context:
space:
mode:
Diffstat (limited to 'sound/drivers/opl4/opl4_proc.c')
-rw-r--r--sound/drivers/opl4/opl4_proc.c24
1 files changed, 12 insertions, 12 deletions
diff --git a/sound/drivers/opl4/opl4_proc.c b/sound/drivers/opl4/opl4_proc.c
index 6a1486258acf..f4b4e74fcc18 100644
--- a/sound/drivers/opl4/opl4_proc.c
+++ b/sound/drivers/opl4/opl4_proc.c
@@ -23,10 +23,10 @@
23 23
24#ifdef CONFIG_PROC_FS 24#ifdef CONFIG_PROC_FS
25 25
26static int snd_opl4_mem_proc_open(snd_info_entry_t *entry, 26static int snd_opl4_mem_proc_open(struct snd_info_entry *entry,
27 unsigned short mode, void **file_private_data) 27 unsigned short mode, void **file_private_data)
28{ 28{
29 opl4_t *opl4 = entry->private_data; 29 struct snd_opl4 *opl4 = entry->private_data;
30 30
31 down(&opl4->access_mutex); 31 down(&opl4->access_mutex);
32 if (opl4->memory_access) { 32 if (opl4->memory_access) {
@@ -38,10 +38,10 @@ static int snd_opl4_mem_proc_open(snd_info_entry_t *entry,
38 return 0; 38 return 0;
39} 39}
40 40
41static int snd_opl4_mem_proc_release(snd_info_entry_t *entry, 41static int snd_opl4_mem_proc_release(struct snd_info_entry *entry,
42 unsigned short mode, void *file_private_data) 42 unsigned short mode, void *file_private_data)
43{ 43{
44 opl4_t *opl4 = entry->private_data; 44 struct snd_opl4 *opl4 = entry->private_data;
45 45
46 down(&opl4->access_mutex); 46 down(&opl4->access_mutex);
47 opl4->memory_access--; 47 opl4->memory_access--;
@@ -49,11 +49,11 @@ static int snd_opl4_mem_proc_release(snd_info_entry_t *entry,
49 return 0; 49 return 0;
50} 50}
51 51
52static long snd_opl4_mem_proc_read(snd_info_entry_t *entry, void *file_private_data, 52static long snd_opl4_mem_proc_read(struct snd_info_entry *entry, void *file_private_data,
53 struct file *file, char __user *_buf, 53 struct file *file, char __user *_buf,
54 unsigned long count, unsigned long pos) 54 unsigned long count, unsigned long pos)
55{ 55{
56 opl4_t *opl4 = entry->private_data; 56 struct snd_opl4 *opl4 = entry->private_data;
57 long size; 57 long size;
58 char* buf; 58 char* buf;
59 59
@@ -75,11 +75,11 @@ static long snd_opl4_mem_proc_read(snd_info_entry_t *entry, void *file_private_d
75 return 0; 75 return 0;
76} 76}
77 77
78static long snd_opl4_mem_proc_write(snd_info_entry_t *entry, void *file_private_data, 78static long snd_opl4_mem_proc_write(struct snd_info_entry *entry, void *file_private_data,
79 struct file *file, const char __user *_buf, 79 struct file *file, const char __user *_buf,
80 unsigned long count, unsigned long pos) 80 unsigned long count, unsigned long pos)
81{ 81{
82 opl4_t *opl4 = entry->private_data; 82 struct snd_opl4 *opl4 = entry->private_data;
83 long size; 83 long size;
84 char *buf; 84 char *buf;
85 85
@@ -101,7 +101,7 @@ static long snd_opl4_mem_proc_write(snd_info_entry_t *entry, void *file_private_
101 return 0; 101 return 0;
102} 102}
103 103
104static long long snd_opl4_mem_proc_llseek(snd_info_entry_t *entry, void *file_private_data, 104static long long snd_opl4_mem_proc_llseek(struct snd_info_entry *entry, void *file_private_data,
105 struct file *file, long long offset, int orig) 105 struct file *file, long long offset, int orig)
106{ 106{
107 switch (orig) { 107 switch (orig) {
@@ -130,9 +130,9 @@ static struct snd_info_entry_ops snd_opl4_mem_proc_ops = {
130 .llseek = snd_opl4_mem_proc_llseek, 130 .llseek = snd_opl4_mem_proc_llseek,
131}; 131};
132 132
133int snd_opl4_create_proc(opl4_t *opl4) 133int snd_opl4_create_proc(struct snd_opl4 *opl4)
134{ 134{
135 snd_info_entry_t *entry; 135 struct snd_info_entry *entry;
136 136
137 entry = snd_info_create_card_entry(opl4->card, "opl4-mem", opl4->card->proc_root); 137 entry = snd_info_create_card_entry(opl4->card, "opl4-mem", opl4->card->proc_root);
138 if (entry) { 138 if (entry) {
@@ -157,7 +157,7 @@ int snd_opl4_create_proc(opl4_t *opl4)
157 return 0; 157 return 0;
158} 158}
159 159
160void snd_opl4_free_proc(opl4_t *opl4) 160void snd_opl4_free_proc(struct snd_opl4 *opl4)
161{ 161{
162 if (opl4->proc_entry) 162 if (opl4->proc_entry)
163 snd_info_unregister(opl4->proc_entry); 163 snd_info_unregister(opl4->proc_entry);