aboutsummaryrefslogtreecommitdiffstats
path: root/sound/oss/opl3.c
diff options
context:
space:
mode:
authorAdrian Bunk <bunk@stusta.de>2007-07-16 02:39:01 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-16 12:05:40 -0400
commitb5d425c97f7d4e92151167b01ca038e7853c6b37 (patch)
treee2a888ad0e79325b3eecd60738ddd92aba770ebf /sound/oss/opl3.c
parent786d7e1612f0b0adb6046f19b906609e4fe8b1ba (diff)
more scheduled OSS driver removal
This patch contains the scheduled removal of OSS drivers that: - have ALSA drivers for the same hardware without known regressions and - whose Kconfig options have been removed in 2.6.20. Signed-off-by: Adrian Bunk <bunk@stusta.de> Acked-by: Jeff Garzik <jeff@garzik.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'sound/oss/opl3.c')
-rw-r--r--sound/oss/opl3.c14
1 files changed, 4 insertions, 10 deletions
diff --git a/sound/oss/opl3.c b/sound/oss/opl3.c
index fc273e550944..7781c13c1476 100644
--- a/sound/oss/opl3.c
+++ b/sound/oss/opl3.c
@@ -34,7 +34,6 @@
34 34
35#include "sound_config.h" 35#include "sound_config.h"
36 36
37#include "opl3.h"
38#include "opl3_hw.h" 37#include "opl3_hw.h"
39 38
40#define MAX_VOICE 18 39#define MAX_VOICE 18
@@ -73,7 +72,6 @@ typedef struct opl_devinfo
73 unsigned char cmask; 72 unsigned char cmask;
74 73
75 int is_opl4; 74 int is_opl4;
76 int *osp;
77} opl_devinfo; 75} opl_devinfo;
78 76
79static struct opl_devinfo *devc = NULL; 77static struct opl_devinfo *devc = NULL;
@@ -144,7 +142,7 @@ static int opl3_ioctl(int dev, unsigned int cmd, void __user * arg)
144 } 142 }
145} 143}
146 144
147int opl3_detect(int ioaddr, int *osp) 145static int opl3_detect(int ioaddr)
148{ 146{
149 /* 147 /*
150 * This function returns 1 if the FM chip is present at the given I/O port 148 * This function returns 1 if the FM chip is present at the given I/O port
@@ -182,7 +180,6 @@ int opl3_detect(int ioaddr, int *osp)
182 goto cleanup_devc; 180 goto cleanup_devc;
183 } 181 }
184 182
185 devc->osp = osp;
186 devc->base = ioaddr; 183 devc->base = ioaddr;
187 184
188 /* Reset timers 1 and 2 */ 185 /* Reset timers 1 and 2 */
@@ -1105,7 +1102,7 @@ static struct synth_operations opl3_operations =
1105 .setup_voice = opl3_setup_voice 1102 .setup_voice = opl3_setup_voice
1106}; 1103};
1107 1104
1108int opl3_init(int ioaddr, int *osp, struct module *owner) 1105static int opl3_init(int ioaddr, struct module *owner)
1109{ 1106{
1110 int i; 1107 int i;
1111 int me; 1108 int me;
@@ -1194,9 +1191,6 @@ int opl3_init(int ioaddr, int *osp, struct module *owner)
1194 return me; 1191 return me;
1195} 1192}
1196 1193
1197EXPORT_SYMBOL(opl3_init);
1198EXPORT_SYMBOL(opl3_detect);
1199
1200static int me; 1194static int me;
1201 1195
1202static int io = -1; 1196static int io = -1;
@@ -1209,12 +1203,12 @@ static int __init init_opl3 (void)
1209 1203
1210 if (io != -1) /* User loading pure OPL3 module */ 1204 if (io != -1) /* User loading pure OPL3 module */
1211 { 1205 {
1212 if (!opl3_detect(io, NULL)) 1206 if (!opl3_detect(io))
1213 { 1207 {
1214 return -ENODEV; 1208 return -ENODEV;
1215 } 1209 }
1216 1210
1217 me = opl3_init(io, NULL, THIS_MODULE); 1211 me = opl3_init(io, THIS_MODULE);
1218 } 1212 }
1219 1213
1220 return 0; 1214 return 0;