Skip to contentSkip to conversation

ALSA: msnd: Remove midi code

PATCH In review [email protected] 2 participants 3 messages May 11, 2025 – May 12, 2025 Sound

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ALSA: msnd: Remove midi code

From: "Dr. David Alan Gilbert" <[email protected]>

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).

---
 sound/isa/msnd/Makefile        |   2 +-
 sound/isa/msnd/msnd.h          |   4 -
 sound/isa/msnd/msnd_midi.c     | 163 ---------------------------------
 sound/isa/msnd/msnd_pinnacle.c |   5 -
 4 files changed, 1 insertion(+), 173 deletions(-)
 delete mode 100644 sound/isa/msnd/msnd_midi.c
sound/isa/msnd/Makefile +1 -1
index 5f8d6b472722..d56412aae857 100644
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0
 
-snd-msnd-lib-y := msnd.o msnd_midi.o msnd_pinnacle_mixer.o
+snd-msnd-lib-y := msnd.o msnd_pinnacle_mixer.o
 snd-msnd-pinnacle-y := msnd_pinnacle.o
 snd-msnd-classic-y := msnd_classic.o
 
sound/isa/msnd/msnd.h +0 -4
index 533d71cee9ba..3d7810ed9186 100644
@@ -216,7 +216,6 @@ struct snd_msnd {
 	int			captureLimit;
 	int			capturePeriods;
 	struct snd_card		*card;
-	void			*msndmidi_mpu;
 	struct snd_rawmidi	*rmidi;
 
 	/* Hardware resources */
@@ -286,9 +285,6 @@ int snd_msnd_DAPQ(struct snd_msnd *chip, int start);
 int snd_msnd_DARQ(struct snd_msnd *chip, int start);
 int snd_msnd_pcm(struct snd_card *card, int device);
 
-int snd_msndmidi_new(struct snd_card *card, int device);
-void snd_msndmidi_input_read(void *mpu);
-
 void snd_msndmix_setup(struct snd_msnd *chip);
 int snd_msndmix_new(struct snd_card *card);
 int snd_msndmix_force_recsrc(struct snd_msnd *chip, int recsrc);
sound/isa/msnd/msnd_midi.c deleted +0 -163

163 lines not on this page · raw message

sound/isa/msnd/msnd_pinnacle.c +0 -5
index 635403301a15..8caf431677e5 100644
@@ -142,11 +142,6 @@ static void snd_msnd_eval_dsp_msg(struct snd_msnd *chip, u16 wMessage)
 		}
 		break;
 
-	case HIMT_MIDI_IN_UCHAR:
-		if (chip->msndmidi_mpu)
-			snd_msndmidi_input_read(chip->msndmidi_mpu);
-		break;
-
 	default:
 		dev_dbg(chip->card->dev, LOGNAME ": HIMT message %d 0x%02x\n",
 			HIBYTE(wMessage), HIBYTE(wMessage));
Signature · 1 line
2.49.0
#1 lore raw
Quoted 8 lines · On Sun, 11 May 2025 19:29:57 +0200, [email protected] wrote:

From: "Dr. David Alan Gilbert" <[email protected]>

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.

Quoted 5 lines

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).

Applied now. Thanks.

Takashi

#2 lore raw
Quoted 10 lines · * Takashi Iwai ([email protected]) wrote:
Quoted 8 lines · On Sun, 11 May 2025 19:29:57 +0200, [email protected] wrote:

From: "Dr. David Alan Gilbert" <[email protected]>

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.

Quoted 7 lines
Quoted 5 lines

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).

Applied now. Thanks.

Thanks!

Dave

Quoted 3 lines

Takashi

Signature · 4 lines
 -----Open up your eyes, open up your mind, open up your code -------   
/ Dr. David Alan Gilbert    |       Running GNU/Linux       | Happy  \ 
\        dave @ treblig.org |                               | In Hex /
 \ _________________________|_____ http://www.treblig.org   |_______/