It was written, but never read from. Its value is available via the epcm
field.
Signed-off-by: Oswald Buddenhagen <oswald.buddenhagen@xxxxxx>
---
include/sound/emu10k1.h | 1 -
sound/pci/emu10k1/emu10k1_main.c | 4 +---
sound/pci/emu10k1/p16v.c | 2 --
3 files changed, 1 insertion(+), 6 deletions(-)
diff --git a/include/sound/emu10k1.h b/include/sound/emu10k1.h
index 9a6ede9ac18a..d1bae032c05f 100644
--- a/include/sound/emu10k1.h
+++ b/include/sound/emu10k1.h
@@ -1485,7 +1485,6 @@ enum {
struct snd_emu10k1;
struct snd_emu10k1_voice {
- struct snd_emu10k1 *emu;
int number;
unsigned int use: 1,
pcm: 1,
diff --git a/sound/pci/emu10k1/emu10k1_main.c b/sound/pci/emu10k1/emu10k1_main.c
index cbfaa4bc70a2..b862f6e7163b 100644
--- a/sound/pci/emu10k1/emu10k1_main.c
+++ b/sound/pci/emu10k1/emu10k1_main.c
@@ -1970,10 +1970,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);
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;
--
2.40.0.152.g15d061e6df
