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.5.x5
[linux-2.6.git]
/
sound
/
oss
/
opl3sa2.c
diff --git
a/sound/oss/opl3sa2.c
b/sound/oss/opl3sa2.c
index
7d7a981
..
7b4996e
100644
(file)
--- a/
sound/oss/opl3sa2.c
+++ b/
sound/oss/opl3sa2.c
@@
-177,9
+177,6
@@
static int __initdata loopback = -1;
static int __initdata isapnp = 1;
static int __initdata multiple = 1;
static int __initdata isapnp = 1;
static int __initdata multiple = 1;
-/* PnP devices */
-struct pnp_dev* opl3sa2_dev[OPL3SA2_CARDS_MAX];
-
/* Whether said devices have been activated */
static int opl3sa2_activated[OPL3SA2_CARDS_MAX];
#else
/* Whether said devices have been activated */
static int opl3sa2_activated[OPL3SA2_CARDS_MAX];
#else
@@
-192,35
+189,35
@@
MODULE_AUTHOR("Scott Murray <scott@spiteful.org>");
MODULE_LICENSE("GPL");
MODULE_LICENSE("GPL");
-
MODULE_PARM(io, "i"
);
+
module_param(io, int, 0
);
MODULE_PARM_DESC(io, "Set I/O base of OPL3-SA2 or SA3 card (usually 0x370. Address must be even and must be from 0x100 to 0xFFE)");
MODULE_PARM_DESC(io, "Set I/O base of OPL3-SA2 or SA3 card (usually 0x370. Address must be even and must be from 0x100 to 0xFFE)");
-
MODULE_PARM(mss_io, "i"
);
+
module_param(mss_io, int, 0
);
MODULE_PARM_DESC(mss_io, "Set MSS (audio) I/O base (0x530, 0xE80, or other. Address must end in 0 or 4 and must be from 0x530 to 0xF48)");
MODULE_PARM_DESC(mss_io, "Set MSS (audio) I/O base (0x530, 0xE80, or other. Address must end in 0 or 4 and must be from 0x530 to 0xF48)");
-
MODULE_PARM(mpu_io, "i"
);
+
module_param(mpu_io, int, 0
);
MODULE_PARM_DESC(mpu_io, "Set MIDI I/O base (0x330 or other. Address must be even and must be from 0x300 to 0x334)");
MODULE_PARM_DESC(mpu_io, "Set MIDI I/O base (0x330 or other. Address must be even and must be from 0x300 to 0x334)");
-
MODULE_PARM(irq, "i"
);
+
module_param(irq, int, 0
);
MODULE_PARM_DESC(mss_irq, "Set MSS (audio) IRQ (5, 7, 9, 10, 11, 12)");
MODULE_PARM_DESC(mss_irq, "Set MSS (audio) IRQ (5, 7, 9, 10, 11, 12)");
-
MODULE_PARM(dma, "i"
);
+
module_param(dma, int, 0
);
MODULE_PARM_DESC(dma, "Set MSS (audio) first DMA channel (0, 1, 3)");
MODULE_PARM_DESC(dma, "Set MSS (audio) first DMA channel (0, 1, 3)");
-
MODULE_PARM(dma2, "i"
);
+
module_param(dma2, int, 0
);
MODULE_PARM_DESC(dma2, "Set MSS (audio) second DMA channel (0, 1, 3)");
MODULE_PARM_DESC(dma2, "Set MSS (audio) second DMA channel (0, 1, 3)");
-
MODULE_PARM(ymode, "i"
);
+
module_param(ymode, int, 0
);
MODULE_PARM_DESC(ymode, "Set Yamaha 3D enhancement mode (0 = Desktop/Normal, 1 = Notebook PC (1), 2 = Notebook PC (2), 3 = Hi-Fi)");
MODULE_PARM_DESC(ymode, "Set Yamaha 3D enhancement mode (0 = Desktop/Normal, 1 = Notebook PC (1), 2 = Notebook PC (2), 3 = Hi-Fi)");
-
MODULE_PARM(loopback, "i"
);
+
module_param(loopback, int, 0
);
MODULE_PARM_DESC(loopback, "Set A/D input source. Useful for echo cancellation (0 = Mic Rch (default), 1 = Mono output loopback)");
#ifdef CONFIG_PNP
MODULE_PARM_DESC(loopback, "Set A/D input source. Useful for echo cancellation (0 = Mic Rch (default), 1 = Mono output loopback)");
#ifdef CONFIG_PNP
-
MODULE_PARM(isapnp, "i"
);
+
module_param(isapnp, bool, 0
);
MODULE_PARM_DESC(isapnp, "When set to 0, ISA PnP support will be disabled");
MODULE_PARM_DESC(isapnp, "When set to 0, ISA PnP support will be disabled");
-
MODULE_PARM(multiple, "i"
);
+
module_param(multiple, bool, 0
);
MODULE_PARM_DESC(multiple, "When set to 0, will not search for multiple cards");
#endif
MODULE_PARM_DESC(multiple, "When set to 0, will not search for multiple cards");
#endif
@@
-714,7
+711,7
@@
static void __init attach_opl3sa2_mixer(struct address_info *hw_config, int card
}
}
-static void
__init
opl3sa2_clear_slots(struct address_info* hw_config)
+static void opl3sa2_clear_slots(struct address_info* hw_config)
{
int i;
{
int i;
@@
-775,7
+772,7
@@
static void __exit unload_opl3sa2(struct address_info* hw_config, int card)
}
#ifdef CONFIG_PNP
}
#ifdef CONFIG_PNP
-struct pnp_device_id pnp_opl3sa2_list[] = {
+st
atic st
ruct pnp_device_id pnp_opl3sa2_list[] = {
{.id = "YMH0021", .driver_data = 0},
{.id = ""}
};
{.id = "YMH0021", .driver_data = 0},
{.id = ""}
};
@@
-835,7
+832,7
@@
static struct pnp_driver opl3sa2_driver = {
/* End of component functions */
#ifdef CONFIG_PM
/* End of component functions */
#ifdef CONFIG_PM
-static
spinlock_t opl3sa2_lock = SPIN_LOCK_UNLOCKED
;
+static
DEFINE_SPINLOCK(opl3sa2_lock)
;
/* Power Management support functions */
static int opl3sa2_suspend(struct pm_dev *pdev, unsigned int pm_mode)
/* Power Management support functions */
static int opl3sa2_suspend(struct pm_dev *pdev, unsigned int pm_mode)