diff mbox series

[v2,1/2] ALSA: emu10k1: remove unused `resume` parameter from snd_emu10k1_init()

Message ID 20230422132430.1057468-1-oswald.buddenhagen@gmx.de (mailing list archive)
State Accepted
Commit be250b7c9b2d8b30d923d6ae947c9f8e5fc40948
Headers show
Series [v2,1/2] ALSA: emu10k1: remove unused `resume` parameter from snd_emu10k1_init() | expand

Commit Message

Oswald Buddenhagen April 22, 2023, 1:24 p.m. UTC 
This was unnecessarily added in commit 09668b441da ("emu10k1 - Add PM
support").

Signed-off-by: Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
---
v2:
- paste subject of referenced commit
---
 sound/pci/emu10k1/emu10k1_main.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Comments

Takashi Iwai April 22, 2023, 3:34 p.m. UTC | #1 
On Sat, 22 Apr 2023 15:24:29 +0200,
Oswald Buddenhagen wrote:
> 
> This was unnecessarily added in commit 09668b441da ("emu10k1 - Add PM
> support").
> 
> Signed-off-by: Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
> ---
> v2:
> - paste subject of referenced commit

Applied both patches now.  Thanks.


Takashi
diff mbox series

Patch

diff --git a/sound/pci/emu10k1/emu10k1_main.c b/sound/pci/emu10k1/emu10k1_main.c
index 3880f359e688..cbfaa4bc70a2 100644
--- a/sound/pci/emu10k1/emu10k1_main.c
+++ b/sound/pci/emu10k1/emu10k1_main.c
@@ -140,7 +140,7 @@  static const unsigned int i2c_adc_init[][2] = {
 	{ 0x15, ADC_MUX_2 },  /* ADC Mixer control. Mic for A2ZS Notebook */
 };
 
-static int snd_emu10k1_init(struct snd_emu10k1 *emu, int enable_ir, int resume)
+static int snd_emu10k1_init(struct snd_emu10k1 *emu, int enable_ir)
 {
 	unsigned int silent_page;
 	int ch;
@@ -1975,7 +1975,7 @@  int snd_emu10k1_create(struct snd_card *card,
 		emu->voices[idx].number = idx;
 	}
 
-	err = snd_emu10k1_init(emu, enable_ir, 0);
+	err = snd_emu10k1_init(emu, enable_ir);
 	if (err < 0)
 		return err;
 #ifdef CONFIG_PM_SLEEP
@@ -2068,7 +2068,7 @@  void snd_emu10k1_resume_init(struct snd_emu10k1 *emu)
 		snd_emu10k1_emu1010_init(emu);
 	else
 		snd_emu10k1_ptr_write(emu, AC97SLOT, 0, AC97SLOT_CNTR|AC97SLOT_LFE);
-	snd_emu10k1_init(emu, emu->enable_ir, 1);
+	snd_emu10k1_init(emu, emu->enable_ir);
 }
 
 void snd_emu10k1_resume_regs(struct snd_emu10k1 *emu)