X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sound%2Foss%2Fopl3sa.c;h=fe4907c6e8fc244d5712870ec90a7d6a1643b3ef;hb=6a77f38946aaee1cd85eeec6cf4229b204c15071;hp=99f4ed66fd9f6dff439b9b9b58239a12f3a74a9d;hpb=87fc8d1bb10cd459024a742c6a10961fefcef18f;p=linux-2.6.git

diff --git a/sound/oss/opl3sa.c b/sound/oss/opl3sa.c
index 99f4ed66f..fe4907c6e 100644
--- a/sound/oss/opl3sa.c
+++ b/sound/oss/opl3sa.c
@@ -36,7 +36,7 @@
 static int sb_initialized;
 #endif
 
-static spinlock_t lock=SPIN_LOCK_UNLOCKED;
+static DEFINE_SPINLOCK(lock);
 
 static unsigned char opl3sa_read(int addr)
 {
@@ -245,12 +245,12 @@ static int __initdata dma2	= -1;
 static int __initdata mpu_io	= -1;
 static int __initdata mpu_irq	= -1;
 
-MODULE_PARM(io,"i");
-MODULE_PARM(irq,"i");
-MODULE_PARM(dma,"i");
-MODULE_PARM(dma2,"i");
-MODULE_PARM(mpu_io,"i");
-MODULE_PARM(mpu_irq,"i");
+module_param(io, int, 0);
+module_param(irq, int, 0);
+module_param(dma, int, 0);
+module_param(dma2, int, 0);
+module_param(mpu_io, int, 0);
+module_param(mpu_irq, int, 0);
 
 static int __init init_opl3sa(void)
 {