Unverified Commit 4882ef44 authored by AngeloGioacchino Del Regno's avatar AngeloGioacchino Del Regno Committed by Mark Brown
Browse files

ASoC: mediatek: mt8188-mt6359: Cleanup return 0 disguised as return ret 



Change all instances of `return ret` to `return 0` at the end of
functions where ret is always zero and also change functions
mt8188_{hdmi,dptx}_codec_init to be consistent with how other
functions are returning errors

Signed-off-by: default avatarAngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Reviewed-by: default avatarAlexandre Mergnat <amergnat@baylibre.com>
Link: https://lore.kernel.org/r/20230608084727.74403-4-angelogioacchino.delregno@collabora.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 1148b422

sound/soc/mediatek/mt8188/mt8188-mt6359.c

+12 −8
Original line number Diff line number Diff line
@@ -491,13 +491,15 @@ static int mt8188_hdmi_codec_init(struct snd_soc_pcm_runtime *rtd) 
	}



	ret = snd_soc_component_set_jack(component, &priv->hdmi_jack, NULL);

	if (ret)

	if (ret) {

		dev_info(rtd->dev, "%s, set jack failed on %s (ret=%d)\n",

			 __func__, component->name, ret);



		return ret;

	}



	return 0;

}



static int mt8188_dptx_codec_init(struct snd_soc_pcm_runtime *rtd)

{

	struct mt8188_mt6359_priv *priv = snd_soc_card_get_drvdata(rtd->card);
@@ -513,13 +515,15 @@ static int mt8188_dptx_codec_init(struct snd_soc_pcm_runtime *rtd) 
	}



	ret = snd_soc_component_set_jack(component, &priv->dp_jack, NULL);

	if (ret)

	if (ret) {

		dev_info(rtd->dev, "%s, set jack failed on %s (ret=%d)\n",

			 __func__, component->name, ret);



		return ret;

	}



	return 0;

}



static int mt8188_dumb_amp_init(struct snd_soc_pcm_runtime *rtd)

{

	struct snd_soc_card *card = rtd->card;
@@ -539,7 +543,7 @@ static int mt8188_dumb_amp_init(struct snd_soc_pcm_runtime *rtd) 
		return ret;

	}



	return ret;

	return 0;

}



static int mt8188_max98390_hw_params(struct snd_pcm_substream *substream,
@@ -612,7 +616,7 @@ static int mt8188_max98390_codec_init(struct snd_soc_pcm_runtime *rtd) 
		return ret;

	}



	return ret;

	return 0;

}



static int mt8188_nau8825_codec_init(struct snd_soc_pcm_runtime *rtd)
@@ -660,7 +664,7 @@ static int mt8188_nau8825_codec_init(struct snd_soc_pcm_runtime *rtd) 
		return ret;

	}



	return ret;

	return 0;

};



static void mt8188_nau8825_codec_exit(struct snd_soc_pcm_runtime *rtd)
@@ -697,7 +701,7 @@ static int mt8188_nau8825_hw_params(struct snd_pcm_substream *substream, 
		return ret;

	}



	return ret;

	return 0;

}



static const struct snd_soc_ops mt8188_nau8825_ops = {