Skip to content

Commit 174d966

Browse files
Dr. David Alan Gilberttiwai
authored andcommitted
ALSA: msnd: Remove midi code
Nothing calls snd_msndmidi_new() thus nothing sets chip->msndmidi_mpu The call to snd_msndmidi_input_read is gated on that being set, so snd_msndmidi_input_read() won't be called either. This is probably a missing call to snd_msndmidi_new(), but since this is ancient code, it's probably best to remove it (especially since I don't have the hardware to test it). Signed-off-by: Dr. David Alan Gilbert <[email protected]> Link: https://patch.msgid.link/[email protected] Signed-off-by: Takashi Iwai <[email protected]>
1 parent b95a1e8 commit 174d966

File tree

4 files changed

+1
-173
lines changed

4 files changed

+1
-173
lines changed

sound/isa/msnd/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# SPDX-License-Identifier: GPL-2.0
22

3-
snd-msnd-lib-y := msnd.o msnd_midi.o msnd_pinnacle_mixer.o
3+
snd-msnd-lib-y := msnd.o msnd_pinnacle_mixer.o
44
snd-msnd-pinnacle-y := msnd_pinnacle.o
55
snd-msnd-classic-y := msnd_classic.o
66

sound/isa/msnd/msnd.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,6 @@ struct snd_msnd {
216216
int captureLimit;
217217
int capturePeriods;
218218
struct snd_card *card;
219-
void *msndmidi_mpu;
220219
struct snd_rawmidi *rmidi;
221220

222221
/* Hardware resources */
@@ -286,9 +285,6 @@ int snd_msnd_DAPQ(struct snd_msnd *chip, int start);
286285
int snd_msnd_DARQ(struct snd_msnd *chip, int start);
287286
int snd_msnd_pcm(struct snd_card *card, int device);
288287

289-
int snd_msndmidi_new(struct snd_card *card, int device);
290-
void snd_msndmidi_input_read(void *mpu);
291-
292288
void snd_msndmix_setup(struct snd_msnd *chip);
293289
int snd_msndmix_new(struct snd_card *card);
294290
int snd_msndmix_force_recsrc(struct snd_msnd *chip, int recsrc);

sound/isa/msnd/msnd_midi.c

Lines changed: 0 additions & 163 deletions
This file was deleted.

sound/isa/msnd/msnd_pinnacle.c

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -142,11 +142,6 @@ static void snd_msnd_eval_dsp_msg(struct snd_msnd *chip, u16 wMessage)
142142
}
143143
break;
144144

145-
case HIMT_MIDI_IN_UCHAR:
146-
if (chip->msndmidi_mpu)
147-
snd_msndmidi_input_read(chip->msndmidi_mpu);
148-
break;
149-
150145
default:
151146
dev_dbg(chip->card->dev, LOGNAME ": HIMT message %d 0x%02x\n",
152147
HIBYTE(wMessage), HIBYTE(wMessage));

0 commit comments

Comments
 (0)