[PATCH 0/5] ALSA: Make always-successful helpers return void

[PATCH 0/5] ALSA: Make always-successful helpers return void

[Ingyu Jang]

These helpers always return 0, so the error checks on their return
values never trigger. This series makes them return void and removes
the dead checks, one driver per patch.

This follows up on the earlier discussion:
https://lore.kernel.org/all/87jywvyu2q.wl-tiwai@suse.de/

Ingyu Jang (5):
  ALSA: hda: Make snd_hda_multi_out_analog_{prepare,cleanup}() return
    void
  ALSA: ice1712: Make chip_init helpers return void
  ALSA: cs4236: Make snd_cs423x_pnp_init_mpu() return void
  ALSA: vx222: Make put_xilinx_data() return void
  ALSA: ali5451: Make snd_ali_reset_5451() return void

 sound/hda/codecs/generic.c   | 22 +++++++++-------------
 sound/hda/common/codec.c     | 16 +++++++---------
 sound/hda/common/hda_local.h | 14 +++++++-------
 sound/isa/cs423x/cs4236.c    |  9 +++------
 sound/pci/ali5451/ali5451.c  | 10 +++-------
 sound/pci/ice1712/ice1712.c  | 12 +++---------
 sound/pci/ice1712/ice1724.c  | 12 +++---------
 sound/pci/vx222/vx222_ops.c  |  7 +++----
 8 files changed, 38 insertions(+), 64 deletions(-)

-- 
2.34.1

[PATCH 1/5] ALSA: hda: Make snd_hda_multi_out_analog_{prepare,cleanup}() return void

[Ingyu Jang]

snd_hda_multi_out_analog_prepare() and snd_hda_multi_out_analog_cleanup()
always return 0, so the error checks on their return values in
playback_pcm_prepare() and playback_pcm_cleanup() never trigger.

Make both functions return void, and call the playback hooks
unconditionally.

Signed-off-by: Ingyu Jang <ingyujang25@korea.ac.kr>
---
 sound/hda/codecs/generic.c   | 22 +++++++++-------------
 sound/hda/common/codec.c     | 16 +++++++---------
 sound/hda/common/hda_local.h | 14 +++++++-------
 3 files changed, 23 insertions(+), 29 deletions(-)

diff --git a/sound/hda/codecs/generic.c b/sound/hda/codecs/generic.c
index 6120f797b45a5..ca780b7f688f6 100644
--- a/sound/hda/codecs/generic.c
+++ b/sound/hda/codecs/generic.c
@@ -5324,14 +5324,12 @@ static int playback_pcm_prepare(struct hda_pcm_stream *hinfo,
 				struct snd_pcm_substream *substream)
 {
 	struct hda_gen_spec *spec = codec->spec;
-	int err;
 
-	err = snd_hda_multi_out_analog_prepare(codec, &spec->multiout,
-					       stream_tag, format, substream);
-	if (!err)
-		call_pcm_playback_hook(hinfo, codec, substream,
-				       HDA_GEN_PCM_ACT_PREPARE);
-	return err;
+	snd_hda_multi_out_analog_prepare(codec, &spec->multiout,
+					 stream_tag, format, substream);
+	call_pcm_playback_hook(hinfo, codec, substream,
+			       HDA_GEN_PCM_ACT_PREPARE);
+	return 0;
 }
 
 static int playback_pcm_cleanup(struct hda_pcm_stream *hinfo,
@@ -5339,13 +5337,11 @@ static int playback_pcm_cleanup(struct hda_pcm_stream *hinfo,
 				struct snd_pcm_substream *substream)
 {
 	struct hda_gen_spec *spec = codec->spec;
-	int err;
 
-	err = snd_hda_multi_out_analog_cleanup(codec, &spec->multiout);
-	if (!err)
-		call_pcm_playback_hook(hinfo, codec, substream,
-				       HDA_GEN_PCM_ACT_CLEANUP);
-	return err;
+	snd_hda_multi_out_analog_cleanup(codec, &spec->multiout);
+	call_pcm_playback_hook(hinfo, codec, substream,
+			       HDA_GEN_PCM_ACT_CLEANUP);
+	return 0;
 }
 
 static int playback_pcm_close(struct hda_pcm_stream *hinfo,
diff --git a/sound/hda/common/codec.c b/sound/hda/common/codec.c
index e367cc1c6e78f..51189e305ece6 100644
--- a/sound/hda/common/codec.c
+++ b/sound/hda/common/codec.c
@@ -3798,11 +3798,11 @@ EXPORT_SYMBOL_GPL(snd_hda_multi_out_analog_open);
  * Set up the i/o for analog out.
  * When the digital out is available, copy the front out to digital out, too.
  */
-int snd_hda_multi_out_analog_prepare(struct hda_codec *codec,
-				     struct hda_multi_out *mout,
-				     unsigned int stream_tag,
-				     unsigned int format,
-				     struct snd_pcm_substream *substream)
+void snd_hda_multi_out_analog_prepare(struct hda_codec *codec,
+				      struct hda_multi_out *mout,
+				      unsigned int stream_tag,
+				      unsigned int format,
+				      struct snd_pcm_substream *substream)
 {
 	const hda_nid_t *nids = mout->dac_nids;
 	int chs = substream->runtime->channels;
@@ -3865,7 +3865,6 @@ int snd_hda_multi_out_analog_prepare(struct hda_codec *codec,
 					   stream_tag, ch, format);
 	}
 
-	return 0;
 }
 EXPORT_SYMBOL_GPL(snd_hda_multi_out_analog_prepare);
 
@@ -3874,8 +3873,8 @@ EXPORT_SYMBOL_GPL(snd_hda_multi_out_analog_prepare);
  * @codec: the HDA codec
  * @mout: hda_multi_out object
  */
-int snd_hda_multi_out_analog_cleanup(struct hda_codec *codec,
-				     struct hda_multi_out *mout)
+void snd_hda_multi_out_analog_cleanup(struct hda_codec *codec,
+				      struct hda_multi_out *mout)
 {
 	const hda_nid_t *nids = mout->dac_nids;
 	int i;
@@ -3897,7 +3896,6 @@ int snd_hda_multi_out_analog_cleanup(struct hda_codec *codec,
 		cleanup_dig_out_stream(codec, mout->dig_out_nid);
 		mout->dig_out_used = 0;
 	}
-	return 0;
 }
 EXPORT_SYMBOL_GPL(snd_hda_multi_out_analog_cleanup);
 
diff --git a/sound/hda/common/hda_local.h b/sound/hda/common/hda_local.h
index 947a3152fdb53..8bd4497a6b090 100644
--- a/sound/hda/common/hda_local.h
+++ b/sound/hda/common/hda_local.h
@@ -241,13 +241,13 @@ int snd_hda_multi_out_analog_open(struct hda_codec *codec,
 				  struct hda_multi_out *mout,
 				  struct snd_pcm_substream *substream,
 				  struct hda_pcm_stream *hinfo);
-int snd_hda_multi_out_analog_prepare(struct hda_codec *codec,
-				     struct hda_multi_out *mout,
-				     unsigned int stream_tag,
-				     unsigned int format,
-				     struct snd_pcm_substream *substream);
-int snd_hda_multi_out_analog_cleanup(struct hda_codec *codec,
-				     struct hda_multi_out *mout);
+void snd_hda_multi_out_analog_prepare(struct hda_codec *codec,
+				      struct hda_multi_out *mout,
+				      unsigned int stream_tag,
+				      unsigned int format,
+				      struct snd_pcm_substream *substream);
+void snd_hda_multi_out_analog_cleanup(struct hda_codec *codec,
+				      struct hda_multi_out *mout);
 
 /*
  * generic proc interface
-- 
2.34.1

[PATCH 2/5] ALSA: ice1712: Make chip_init helpers return void

[Ingyu Jang]

snd_ice1712_chip_init() and snd_vt1724_chip_init() always return 0, so
the error checks on their return values in the probe and resume paths
never trigger.

Change both functions to return void and remove the dead checks.

Signed-off-by: Ingyu Jang <ingyujang25@korea.ac.kr>
---
 sound/pci/ice1712/ice1712.c | 12 +++---------
 sound/pci/ice1712/ice1724.c | 12 +++---------
 2 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/sound/pci/ice1712/ice1712.c b/sound/pci/ice1712/ice1712.c
index 1fad8c418132c..ae1a9de22ce20 100644
--- a/sound/pci/ice1712/ice1712.c
+++ b/sound/pci/ice1712/ice1712.c
@@ -2283,7 +2283,7 @@ static int snd_ice1712_read_eeprom(struct snd_ice1712 *ice,
 
 
 
-static int snd_ice1712_chip_init(struct snd_ice1712 *ice)
+static void snd_ice1712_chip_init(struct snd_ice1712 *ice)
 {
 	outb(ICE1712_RESET | ICE1712_NATIVE, ICEREG(ice, CONTROL));
 	udelay(200);
@@ -2334,8 +2334,6 @@ static int snd_ice1712_chip_init(struct snd_ice1712 *ice)
 	      ICE1712_IRQ_PBKDS | ICE1712_IRQ_CONCAP | ICE1712_IRQ_CONPBK : 0),
 	     ICEREG(ice, IRQMASK));
 	outb(0x00, ICEMT(ice, IRQ));
-
-	return 0;
 }
 
 int snd_ice1712_spdif_build_controls(struct snd_ice1712 *ice)
@@ -2504,8 +2502,7 @@ static int snd_ice1712_create(struct snd_card *card,
 
 	if (snd_ice1712_read_eeprom(ice, modelname) < 0)
 		return -EIO;
-	if (snd_ice1712_chip_init(ice) < 0)
-		return -EIO;
+	snd_ice1712_chip_init(ice);
 
 	return 0;
 }
@@ -2683,10 +2680,7 @@ static int snd_ice1712_resume(struct device *dev)
 	else
 		rate = PRO_RATE_DEFAULT;
 
-	if (snd_ice1712_chip_init(ice) < 0) {
-		snd_card_disconnect(card);
-		return -EIO;
-	}
+	snd_ice1712_chip_init(ice);
 
 	ice->cur_rate = rate;
 
diff --git a/sound/pci/ice1712/ice1724.c b/sound/pci/ice1712/ice1724.c
index 651d926635675..d4ed7050c533a 100644
--- a/sound/pci/ice1712/ice1724.c
+++ b/sound/pci/ice1712/ice1724.c
@@ -2342,7 +2342,7 @@ static void snd_vt1724_chip_reset(struct snd_ice1712 *ice)
 	msleep(10);
 }
 
-static int snd_vt1724_chip_init(struct snd_ice1712 *ice)
+static void snd_vt1724_chip_init(struct snd_ice1712 *ice)
 {
 	outb(ice->eeprom.data[ICE_EEP2_SYSCONF], ICEREG1724(ice, SYS_CFG));
 	outb(ice->eeprom.data[ICE_EEP2_ACLINK], ICEREG1724(ice, AC97_CFG));
@@ -2364,8 +2364,6 @@ static int snd_vt1724_chip_init(struct snd_ice1712 *ice)
 	 * since they cause machine lockups
 	 */
 	outb(VT1724_MULTI_FIFO_ERR, ICEMT1724(ice, DMA_INT_MASK));
-
-	return 0;
 }
 
 static int snd_vt1724_spdif_build_controls(struct snd_ice1712 *ice)
@@ -2511,8 +2509,7 @@ static int snd_vt1724_create(struct snd_card *card,
 	snd_vt1724_chip_reset(ice);
 	if (snd_vt1724_read_eeprom(ice, modelname) < 0)
 		return -EIO;
-	if (snd_vt1724_chip_init(ice) < 0)
-		return -EIO;
+	snd_vt1724_chip_init(ice);
 
 	return 0;
 }
@@ -2703,10 +2700,7 @@ static int snd_vt1724_resume(struct device *dev)
 
 	snd_vt1724_chip_reset(ice);
 
-	if (snd_vt1724_chip_init(ice) < 0) {
-		snd_card_disconnect(card);
-		return -EIO;
-	}
+	snd_vt1724_chip_init(ice);
 
 	if (ice->pm_resume)
 		ice->pm_resume(ice);
-- 
2.34.1

Re: [PATCH 2/5] ALSA: ice1712: Make chip_init helpers return void

[Takashi Iwai]

On Sun, 01 Nov 2026 18:21:31 +0100,
Ingyu Jang wrote:
> 
> snd_ice1712_chip_init() and snd_vt1724_chip_init() always return 0, so
> the error checks on their return values in the probe and resume paths
> never trigger.
> 
> Change both functions to return void and remove the dead checks.
> 
> Signed-off-by: Ingyu Jang <ingyujang25@korea.ac.kr>

This one doesn't apply any longer due to the recent change.
Could you rebase and resubmit only this?  Others have been merged.


thanks,

Takashi

[PATCH 3/5] ALSA: cs4236: Make snd_cs423x_pnp_init_mpu() return void

[Ingyu Jang]

snd_cs423x_pnp_init_mpu() handles a pnp_activate_dev() failure itself by
falling back to SNDRV_AUTO_PORT and always returns 0, so the error check
in snd_card_cs423x_pnp() never triggers.

Change the function's return type to void and remove the dead check.

Signed-off-by: Ingyu Jang <ingyujang25@korea.ac.kr>
---
 sound/isa/cs423x/cs4236.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/sound/isa/cs423x/cs4236.c b/sound/isa/cs423x/cs4236.c
index ecce31b348b02..167a198fa0fb9 100644
--- a/sound/isa/cs423x/cs4236.c
+++ b/sound/isa/cs423x/cs4236.c
@@ -236,7 +236,7 @@ static int snd_cs423x_pnp_init_ctrl(int dev, struct pnp_dev *pdev)
 }
 
 /* MPU initialization */
-static int snd_cs423x_pnp_init_mpu(int dev, struct pnp_dev *pdev)
+static void snd_cs423x_pnp_init_mpu(int dev, struct pnp_dev *pdev)
 {
 	if (pnp_activate_dev(pdev) < 0) {
 		dev_err(&pdev->dev, IDENT " MPU401 PnP configure failed for WSS (out of resources?)\n");
@@ -253,7 +253,6 @@ static int snd_cs423x_pnp_init_mpu(int dev, struct pnp_dev *pdev)
 		}
 	}
 	dev_dbg(&pdev->dev, "isapnp MPU: port=0x%lx, irq=%i\n", mpu_port[dev], mpu_irq[dev]);
-	return 0;
 }
 
 static int snd_card_cs423x_pnp(int dev, struct snd_card_cs4236 *acard,
@@ -296,10 +295,8 @@ static int snd_card_cs423x_pnpc(int dev, struct snd_card_cs4236 *acard,
 			return -EBUSY;
 	}
 	/* MPU initialization */
-	if (acard->mpu && mpu_port[dev] > 0) {
-		if (snd_cs423x_pnp_init_mpu(dev, acard->mpu) < 0)
-			return -EBUSY;
-	}
+	if (acard->mpu && mpu_port[dev] > 0)
+		snd_cs423x_pnp_init_mpu(dev, acard->mpu);
 	return 0;
 }
 #endif /* CONFIG_PNP */
-- 
2.34.1

[PATCH 4/5] ALSA: vx222: Make put_xilinx_data() return void

[Ingyu Jang]

put_xilinx_data() always returns 0, so the error check on its return
value in vx2_load_xilinx_binary() never triggers.

Change the function's return type to void and remove the dead check.

Signed-off-by: Ingyu Jang <ingyujang25@korea.ac.kr>
---
 sound/pci/vx222/vx222_ops.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/sound/pci/vx222/vx222_ops.c b/sound/pci/vx222/vx222_ops.c
index 40f3716c478f4..348666b422f5c 100644
--- a/sound/pci/vx222/vx222_ops.c
+++ b/sound/pci/vx222/vx222_ops.c
@@ -321,7 +321,8 @@ static void vx2_dma_read(struct vx_core *chip, struct snd_pcm_runtime *runtime,
 /*
  * transfer counts bits to PLX
  */
-static int put_xilinx_data(struct vx_core *chip, unsigned int port, unsigned int counts, unsigned char data)
+static void put_xilinx_data(struct vx_core *chip, unsigned int port,
+			    unsigned int counts, unsigned char data)
 {
 	unsigned int i;
 
@@ -347,7 +348,6 @@ static int put_xilinx_data(struct vx_core *chip, unsigned int port, unsigned int
 		vx2_inl(chip, port);
 		udelay(1);
 	}
-	return 0;
 }
 
 /*
@@ -374,8 +374,7 @@ static int vx2_load_xilinx_binary(struct vx_core *chip, const struct firmware *x
 
 	image = xilinx->data;
 	for (i = 0; i < xilinx->size; i++, image++) {
-		if (put_xilinx_data(chip, port, 8, *image) < 0)
-			return -EINVAL;
+		put_xilinx_data(chip, port, 8, *image);
 		/* don't take too much time in this loop... */
 		cond_resched();
 	}
-- 
2.34.1

[PATCH 5/5] ALSA: ali5451: Make snd_ali_reset_5451() return void

[Ingyu Jang]

snd_ali_reset_5451() always returns 0, as a reset timeout is treated as
non-fatal, so the error check in snd_ali_chip_init() never triggers.

Change the function's return type to void and remove the dead check.

Signed-off-by: Ingyu Jang <ingyujang25@korea.ac.kr>
---
 sound/pci/ali5451/ali5451.c | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/sound/pci/ali5451/ali5451.c b/sound/pci/ali5451/ali5451.c
index 8295eee9b977f..b86b921296427 100644
--- a/sound/pci/ali5451/ali5451.c
+++ b/sound/pci/ali5451/ali5451.c
@@ -414,7 +414,7 @@ static unsigned short snd_ali_codec_read(struct snd_ac97 *ac97,
  *	AC97 Reset
  */
 
-static int snd_ali_reset_5451(struct snd_ali *codec)
+static void snd_ali_reset_5451(struct snd_ali *codec)
 {
 	struct pci_dev *pci_dev;
 	unsigned short wCount, wReg;
@@ -442,13 +442,12 @@ static int snd_ali_reset_5451(struct snd_ali *codec)
 	while(wCount--) {
 		wReg = snd_ali_codec_peek(codec, 0, AC97_POWERDOWN);
 		if ((wReg & 0x000f) == 0x000f)
-			return 0;
+			return;
 		mdelay(5);
 	}
 
 	/* non-fatal if you have a non PM capable codec */
 	/* dev_warn(codec->card->dev, "ali5451: reset time out\n"); */
-	return 0;
 }
 
 /*
@@ -1901,10 +1900,7 @@ static int snd_ali_chip_init(struct snd_ali *codec)
 
 	dev_dbg(codec->card->dev, "chip initializing ...\n");
 
-	if (snd_ali_reset_5451(codec)) {
-		dev_err(codec->card->dev, "ali_chip_init: reset 5451 error.\n");
-		return -1;
-	}
+	snd_ali_reset_5451(codec);
 
 	if (codec->revision == ALI_5451_V02) {
         	pci_dev = codec->pci_m1533;
-- 
2.34.1

Re: [PATCH 0/5] ALSA: Make always-successful helpers return void

[Takashi Iwai]

On Sun, 01 Nov 2026 18:21:29 +0100,
Ingyu Jang wrote:
> 
> These helpers always return 0, so the error checks on their return
> values never trigger. This series makes them return void and removes
> the dead checks, one driver per patch.
> 
> This follows up on the earlier discussion:
> https://lore.kernel.org/all/87jywvyu2q.wl-tiwai@suse.de/
> 
> Ingyu Jang (5):
>   ALSA: hda: Make snd_hda_multi_out_analog_{prepare,cleanup}() return
>     void
>   ALSA: ice1712: Make chip_init helpers return void
>   ALSA: cs4236: Make snd_cs423x_pnp_init_mpu() return void
>   ALSA: vx222: Make put_xilinx_data() return void
>   ALSA: ali5451: Make snd_ali_reset_5451() return void

Patches except for ice1712 have been merged to for-next branch now.


thanks,

Takashi