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.3
[linux-2.6.git]
/
sound
/
drivers
/
opl3
/
opl3_seq.c
diff --git
a/sound/drivers/opl3/opl3_seq.c
b/sound/drivers/opl3/opl3_seq.c
index
c6953b8
..
048b33a
100644
(file)
--- a/
sound/drivers/opl3/opl3_seq.c
+++ b/
sound/drivers/opl3/opl3_seq.c
@@
-30,7
+30,6
@@
MODULE_AUTHOR("Uros Bizjak <uros@kss-loka.si>");
MODULE_LICENSE("GPL");
MODULE_DESCRIPTION("ALSA driver for OPL3 FM synth");
MODULE_AUTHOR("Uros Bizjak <uros@kss-loka.si>");
MODULE_LICENSE("GPL");
MODULE_DESCRIPTION("ALSA driver for OPL3 FM synth");
-MODULE_CLASSES("{sound}");
int use_internal_drums = 0;
module_param(use_internal_drums, bool, 0444);
int use_internal_drums = 0;
module_param(use_internal_drums, bool, 0444);
@@
-99,7
+98,7
@@
void snd_opl3_synth_cleanup(opl3_t * opl3)
int snd_opl3_synth_use(void *private_data, snd_seq_port_subscribe_t * info)
{
int snd_opl3_synth_use(void *private_data, snd_seq_port_subscribe_t * info)
{
- opl3_t *opl3 =
snd_magic_cast(opl3_t, private_data, return -ENXIO)
;
+ opl3_t *opl3 =
private_data
;
int err;
if ((err = snd_opl3_synth_setup(opl3)) < 0)
int err;
if ((err = snd_opl3_synth_setup(opl3)) < 0)
@@
-126,7
+125,7
@@
int snd_opl3_synth_use(void *private_data, snd_seq_port_subscribe_t * info)
int snd_opl3_synth_unuse(void *private_data, snd_seq_port_subscribe_t * info)
{
int snd_opl3_synth_unuse(void *private_data, snd_seq_port_subscribe_t * info)
{
- opl3_t *opl3 =
snd_magic_cast(opl3_t, private_data, return -ENXIO)
;
+ opl3_t *opl3 =
private_data
;
snd_opl3_synth_cleanup(opl3);
snd_opl3_synth_cleanup(opl3);
@@
-151,7
+150,7
@@
snd_midi_op_t opl3_ops = {
static int snd_opl3_synth_event_input(snd_seq_event_t * ev, int direct,
void *private_data, int atomic, int hop)
{
static int snd_opl3_synth_event_input(snd_seq_event_t * ev, int direct,
void *private_data, int atomic, int hop)
{
- opl3_t *opl3 =
snd_magic_cast(opl3_t, private_data, return -EINVAL)
;
+ opl3_t *opl3 =
private_data
;
if (ev->type >= SNDRV_SEQ_EVENT_INSTR_BEGIN &&
ev->type <= SNDRV_SEQ_EVENT_INSTR_CHANGE) {
if (ev->type >= SNDRV_SEQ_EVENT_INSTR_BEGIN &&
ev->type <= SNDRV_SEQ_EVENT_INSTR_CHANGE) {
@@
-169,7
+168,7
@@
static int snd_opl3_synth_event_input(snd_seq_event_t * ev, int direct,
static void snd_opl3_synth_free_port(void *private_data)
{
static void snd_opl3_synth_free_port(void *private_data)
{
- opl3_t *opl3 =
snd_magic_cast(opl3_t, private_data, return)
;
+ opl3_t *opl3 =
private_data
;
snd_midi_channel_free_set(opl3->chset);
}
snd_midi_channel_free_set(opl3->chset);
}