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
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
sound
/
pci
/
emu10k1
/
emu10k1_synth.c
diff --git
a/sound/pci/emu10k1/emu10k1_synth.c
b/sound/pci/emu10k1/emu10k1_synth.c
index
8bd58d1
..
204995a
100644
(file)
--- a/
sound/pci/emu10k1/emu10k1_synth.c
+++ b/
sound/pci/emu10k1/emu10k1_synth.c
@@
-28,11
+28,11
@@
MODULE_LICENSE("GPL");
/*
* create a new hardware dependent device for Emu10k1
*/
/*
* create a new hardware dependent device for Emu10k1
*/
-static int snd_emu10k1_synth_new_device(s
nd_seq_device_t
*dev)
+static int snd_emu10k1_synth_new_device(s
truct snd_seq_device
*dev)
{
{
- s
nd_emux_t
*emu;
-
emu10k1_t
*hw;
- s
nd_emu10k1_synth_arg_t
*arg;
+ s
truct snd_emux
*emu;
+
struct snd_emu10k1
*hw;
+ s
truct snd_emu10k1_synth_arg
*arg;
unsigned long flags;
arg = SNDRV_SEQ_DEVICE_ARGPTR(dev);
unsigned long flags;
arg = SNDRV_SEQ_DEVICE_ARGPTR(dev);
@@
-62,7
+62,6
@@
static int snd_emu10k1_synth_new_device(snd_seq_device_t *dev)
if (snd_emux_register(emu, dev->card, arg->index, "Emu10k1") < 0) {
snd_emux_free(emu);
if (snd_emux_register(emu, dev->card, arg->index, "Emu10k1") < 0) {
snd_emux_free(emu);
- emu->hw = NULL;
return -ENOMEM;
}
return -ENOMEM;
}
@@
-76,10
+75,10
@@
static int snd_emu10k1_synth_new_device(snd_seq_device_t *dev)
return 0;
}
return 0;
}
-static int snd_emu10k1_synth_delete_device(s
nd_seq_device_t
*dev)
+static int snd_emu10k1_synth_delete_device(s
truct snd_seq_device
*dev)
{
{
- s
nd_emux_t
*emu;
-
emu10k1_t
*hw;
+ s
truct snd_emux
*emu;
+
struct snd_emu10k1
*hw;
unsigned long flags;
if (dev->driver_data == NULL)
unsigned long flags;
if (dev->driver_data == NULL)
@@
-104,11
+103,12
@@
static int snd_emu10k1_synth_delete_device(snd_seq_device_t *dev)
static int __init alsa_emu10k1_synth_init(void)
{
static int __init alsa_emu10k1_synth_init(void)
{
- static s
nd_seq_dev_ops_t
ops = {
+ static s
truct snd_seq_dev_ops
ops = {
snd_emu10k1_synth_new_device,
snd_emu10k1_synth_delete_device,
};
snd_emu10k1_synth_new_device,
snd_emu10k1_synth_delete_device,
};
- return snd_seq_device_register_driver(SNDRV_SEQ_DEV_ID_EMU10K1_SYNTH, &ops, sizeof(snd_emu10k1_synth_arg_t));
+ return snd_seq_device_register_driver(SNDRV_SEQ_DEV_ID_EMU10K1_SYNTH, &ops,
+ sizeof(struct snd_emu10k1_synth_arg));
}
static void __exit alsa_emu10k1_synth_exit(void)
}
static void __exit alsa_emu10k1_synth_exit(void)