diff options
Diffstat (limited to 'sound/isa/gus/gus_main.c')
-rw-r--r-- | sound/isa/gus/gus_main.c | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/sound/isa/gus/gus_main.c b/sound/isa/gus/gus_main.c index b14d5d6d9a32..e4453e5e5c23 100644 --- a/sound/isa/gus/gus_main.c +++ b/sound/isa/gus/gus_main.c | |||
@@ -104,12 +104,6 @@ static int snd_gus_free(struct snd_gus_card *gus) | |||
104 | { | 104 | { |
105 | if (gus->gf1.res_port2 == NULL) | 105 | if (gus->gf1.res_port2 == NULL) |
106 | goto __hw_end; | 106 | goto __hw_end; |
107 | #if defined(CONFIG_SND_SEQUENCER) || (defined(MODULE) && defined(CONFIG_SND_SEQUENCER_MODULE)) | ||
108 | if (gus->seq_dev) { | ||
109 | snd_device_free(gus->card, gus->seq_dev); | ||
110 | gus->seq_dev = NULL; | ||
111 | } | ||
112 | #endif | ||
113 | snd_gf1_stop(gus); | 107 | snd_gf1_stop(gus); |
114 | snd_gus_init_dma_irq(gus, 0); | 108 | snd_gus_init_dma_irq(gus, 0); |
115 | __hw_end: | 109 | __hw_end: |
@@ -408,14 +402,6 @@ static int snd_gus_check_version(struct snd_gus_card * gus) | |||
408 | return 0; | 402 | return 0; |
409 | } | 403 | } |
410 | 404 | ||
411 | #if defined(CONFIG_SND_SEQUENCER) || (defined(MODULE) && defined(CONFIG_SND_SEQUENCER_MODULE)) | ||
412 | static void snd_gus_seq_dev_free(struct snd_seq_device *seq_dev) | ||
413 | { | ||
414 | struct snd_gus_card *gus = seq_dev->private_data; | ||
415 | gus->seq_dev = NULL; | ||
416 | } | ||
417 | #endif | ||
418 | |||
419 | int snd_gus_initialize(struct snd_gus_card *gus) | 405 | int snd_gus_initialize(struct snd_gus_card *gus) |
420 | { | 406 | { |
421 | int err; | 407 | int err; |
@@ -430,15 +416,6 @@ int snd_gus_initialize(struct snd_gus_card *gus) | |||
430 | } | 416 | } |
431 | if ((err = snd_gus_init_dma_irq(gus, 1)) < 0) | 417 | if ((err = snd_gus_init_dma_irq(gus, 1)) < 0) |
432 | return err; | 418 | return err; |
433 | #if defined(CONFIG_SND_SEQUENCER) || (defined(MODULE) && defined(CONFIG_SND_SEQUENCER_MODULE)) | ||
434 | if (snd_seq_device_new(gus->card, 1, SNDRV_SEQ_DEV_ID_GUS, | ||
435 | sizeof(struct snd_gus_card *), &gus->seq_dev) >= 0) { | ||
436 | strcpy(gus->seq_dev->name, "GUS"); | ||
437 | *(struct snd_gus_card **)SNDRV_SEQ_DEVICE_ARGPTR(gus->seq_dev) = gus; | ||
438 | gus->seq_dev->private_data = gus; | ||
439 | gus->seq_dev->private_free = snd_gus_seq_dev_free; | ||
440 | } | ||
441 | #endif | ||
442 | snd_gf1_start(gus); | 419 | snd_gf1_start(gus); |
443 | gus->initialized = 1; | 420 | gus->initialized = 1; |
444 | return 0; | 421 | return 0; |