fixup! ASoC: card: Let 'fixup_controls' return errors

john-cabaj · marcan · commit 326261b292bc · 2023-11-04T17:09:41.000+09:00
fixup_controls() was modified in 25fb334 to return error code. One reference in the MediaTek MT8188 still returned void. Signed-off-by: John Cabaj <john.cabaj@canonical.com>
diff --git a/sound/soc/mediatek/mt8188/mt8188-mt6359.c b/sound/soc/mediatek/mt8188/mt8188-mt6359.c
@@ -979,7 +979,7 @@ static struct snd_kcontrol *ctl_find(struct snd_card *card, const char *name)
 	return snd_ctl_find_id(card, &sid);
 }
 
-static void mt8188_fixup_controls(struct snd_soc_card *card)
+static int mt8188_fixup_controls(struct snd_soc_card *card)
 {
 	struct mt8188_mt6359_priv *priv = snd_soc_card_get_drvdata(card);
 	struct mt8188_card_data *card_data = (struct mt8188_card_data *)priv->private_data;
@@ -1001,6 +1001,8 @@ static void mt8188_fixup_controls(struct snd_soc_card *card)
 		else
 			dev_warn(card->dev, "Cannot find ctl : Headphone Switch\n");
 	}
+
+	return 0;
 }
 
 static struct snd_soc_card mt8188_mt6359_soc_card = {

Original file line number	Diff line number	Diff line change
`@@ -979,7 +979,7 @@ static struct snd_kcontrol ctl_find(struct snd_card card, const char *name)`
`979`	`979`	`return snd_ctl_find_id(card, &sid);`
`980`	`980`	`}`
`981`	`981`
`982`		`-static void mt8188_fixup_controls(struct snd_soc_card *card)`
	`982`	`+static int mt8188_fixup_controls(struct snd_soc_card *card)`
`983`	`983`	`{`
`984`	`984`	`struct mt8188_mt6359_priv *priv = snd_soc_card_get_drvdata(card);`
`985`	`985`	`struct mt8188_card_data card_data = (struct mt8188_card_data )priv->private_data;`
`@@ -1001,6 +1001,8 @@ static void mt8188_fixup_controls(struct snd_soc_card *card)`
`1001`	`1001`	`else`
`1002`	`1002`	`dev_warn(card->dev, "Cannot find ctl : Headphone Switch\n");`
`1003`	`1003`	`}`
	`1004`	`+`
	`1005`	`+ return 0;`
`1004`	`1006`	`}`
`1005`	`1007`
`1006`	`1008`	`static struct snd_soc_card mt8188_mt6359_soc_card = {`