diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2006-01-17 10:26:28 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2006-01-17 10:26:28 -0500 |
| commit | 0825788ff27c7145e9d558cb2a26f3837d1f9be5 (patch) | |
| tree | f6bdb892cec8ca0df69c08a3477c89f1542999e5 /sound/isa/sb/emu8000_synth.c | |
| parent | 02f693c7118f6be9e677070eb630c1f3a654cdd3 (diff) | |
| parent | 1bc4ccfff8675adc3d96f91245eb7e2dc0043ca9 (diff) | |
Merge branch 'upstream'
Diffstat (limited to 'sound/isa/sb/emu8000_synth.c')
| -rw-r--r-- | sound/isa/sb/emu8000_synth.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/sound/isa/sb/emu8000_synth.c b/sound/isa/sb/emu8000_synth.c index f68e217416a6..3d72742b342f 100644 --- 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 */ -static int snd_emu8000_new_device(snd_seq_device_t *dev) +static int snd_emu8000_new_device(struct snd_seq_device *dev) { - emu8000_t *hw; - snd_emux_t *emu; + struct snd_emu8000 *hw; + struct 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; @@ -92,9 +92,9 @@ static int snd_emu8000_new_device(snd_seq_device_t *dev) /* * free all resources */ -static int snd_emu8000_delete_device(snd_seq_device_t *dev) +static int snd_emu8000_delete_device(struct snd_seq_device *dev) { - emu8000_t *hw; + struct snd_emu8000 *hw; 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 snd_seq_dev_ops_t ops = { + static struct snd_seq_dev_ops ops = { 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) |