summaryrefslogtreecommitdiff
path: root/sound/pci
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@gmx.de>2023-04-21 17:10:04 +0300
committerTakashi Iwai <tiwai@suse.de>2023-04-22 11:40:55 +0300
commit14a5c5a44b61953b3f84a01152fe1d40838f5d91 (patch)
tree6dce36fd5603efe203e384fac3ee84f3e34bda68 /sound/pci
parentd4af7ca20173e61b77584e4f2025387b7b76ef75 (diff)
downloadlinux-14a5c5a44b61953b3f84a01152fe1d40838f5d91.tar.xz
ALSA: emu10k1: remove unused snd_emu10k1_voice.emu field
It was written, but never read from. Its value is available via the epcm field. Signed-off-by: Oswald Buddenhagen <oswald.buddenhagen@gmx.de> Link: https://lore.kernel.org/r/20230421141006.1005452-5-oswald.buddenhagen@gmx.de Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci')
-rw-r--r--sound/pci/emu10k1/emu10k1_main.c4
-rw-r--r--sound/pci/emu10k1/p16v.c2
2 files changed, 1 insertions, 5 deletions
diff --git a/sound/pci/emu10k1/emu10k1_main.c b/sound/pci/emu10k1/emu10k1_main.c
index 65fd6b62bc9c..4af7c95fc665 100644
--- a/sound/pci/emu10k1/emu10k1_main.c
+++ b/sound/pci/emu10k1/emu10k1_main.c
@@ -1971,10 +1971,8 @@ int snd_emu10k1_create(struct snd_card *card,
pgtbl[idx] = cpu_to_le32(silent_page | idx);
/* set up voice indices */
- for (idx = 0; idx < NUM_G; idx++) {
- emu->voices[idx].emu = emu;
+ for (idx = 0; idx < NUM_G; idx++)
emu->voices[idx].number = idx;
- }
err = snd_emu10k1_init(emu, enable_ir, 0);
if (err < 0)
diff --git a/sound/pci/emu10k1/p16v.c b/sound/pci/emu10k1/p16v.c
index 18a1b0740e6b..f5e0972187a7 100644
--- a/sound/pci/emu10k1/p16v.c
+++ b/sound/pci/emu10k1/p16v.c
@@ -181,7 +181,6 @@ static int snd_p16v_pcm_open_playback_channel(struct snd_pcm_substream *substrea
runtime->hw = snd_p16v_playback_hw;
- channel->emu = emu;
channel->number = channel_id;
channel->use=1;
@@ -230,7 +229,6 @@ static int snd_p16v_pcm_open_capture_channel(struct snd_pcm_substream *substream
runtime->hw = snd_p16v_capture_hw;
- channel->emu = emu;
channel->number = channel_id;
channel->use=1;