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 kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
sound
/
isa
/
sb
/
emu8000_synth.c
diff --git
a/sound/isa/sb/emu8000_synth.c
b/sound/isa/sb/emu8000_synth.c
index
1f63aa5
..
3d72742
100644
(file)
--- a/
sound/isa/sb/emu8000_synth.c
+++ b/
sound/isa/sb/emu8000_synth.c
@@
-33,12
+33,12
@@
MODULE_LICENSE("GPL");
/*
* create a new hardware dependent device for Emu8000
*/
/*
* create a new hardware dependent device for Emu8000
*/
-static int snd_emu8000_new_device(s
nd_seq_device_t
*dev)
+static int snd_emu8000_new_device(s
truct snd_seq_device
*dev)
{
{
-
emu8000_t
*hw;
- s
nd_emux_t
*emu;
+
struct snd_emu8000
*hw;
+ s
truct snd_emux
*emu;
- hw = *(
emu8000_t
**)SNDRV_SEQ_DEVICE_ARGPTR(dev);
+ hw = *(
struct snd_emu8000
**)SNDRV_SEQ_DEVICE_ARGPTR(dev);
if (hw == NULL)
return -EINVAL;
if (hw == NULL)
return -EINVAL;
@@
-56,7
+56,7
@@
static int snd_emu8000_new_device(snd_seq_device_t *dev)
emu->num_ports = hw->seq_ports;
if (hw->memhdr) {
emu->num_ports = hw->seq_ports;
if (hw->memhdr) {
- snd_printk("memhdr is already initialized!?\n");
+ snd_printk(
KERN_ERR
"memhdr is already initialized!?\n");
snd_util_memhdr_free(hw->memhdr);
}
hw->memhdr = snd_util_memhdr_new(hw->mem_size);
snd_util_memhdr_free(hw->memhdr);
}
hw->memhdr = snd_util_memhdr_new(hw->mem_size);
@@
-92,9
+92,9
@@
static int snd_emu8000_new_device(snd_seq_device_t *dev)
/*
* free all resources
*/
/*
* free all resources
*/
-static int snd_emu8000_delete_device(s
nd_seq_device_t
*dev)
+static int snd_emu8000_delete_device(s
truct snd_seq_device
*dev)
{
{
-
emu8000_t
*hw;
+
struct snd_emu8000
*hw;
if (dev->driver_data == NULL)
return 0; /* no synth was allocated actually */
if (dev->driver_data == NULL)
return 0; /* no synth was allocated actually */
@@
-118,11
+118,12
@@
static int snd_emu8000_delete_device(snd_seq_device_t *dev)
static int __init alsa_emu8000_init(void)
{
static int __init alsa_emu8000_init(void)
{
- static s
nd_seq_dev_ops_t
ops = {
+ static s
truct snd_seq_dev_ops
ops = {
snd_emu8000_new_device,
snd_emu8000_delete_device,
};
snd_emu8000_new_device,
snd_emu8000_delete_device,
};
- return snd_seq_device_register_driver(SNDRV_SEQ_DEV_ID_EMU8000, &ops, sizeof(emu8000_t*));
+ return snd_seq_device_register_driver(SNDRV_SEQ_DEV_ID_EMU8000, &ops,
+ sizeof(struct snd_emu8000*));
}
static void __exit alsa_emu8000_exit(void)
}
static void __exit alsa_emu8000_exit(void)