Unverified Commit 77e6a5e4 authored by Liu Jing's avatar Liu Jing Committed by Mark Brown
Browse files

ASoC: mediatek: mt2701-cs42448: Optimize redundant code in mt2701_cs42448_machine_probe 



Utilize the defined parameter 'dev' to make the code cleaner.

Signed-off-by: default avatarLiu Jing <liujing@cmss.chinamobile.com>
Reviewed-by: default avatarMatthias Brugger <matthias.bgg@gmail.com>
Link: https://patch.msgid.link/20240903093623.7120-1-liujing@cmss.chinamobile.com


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

sound/soc/mediatek/mt2701/mt2701-cs42448.c

+8 −8
Original line number Diff line number Diff line
@@ -329,10 +329,10 @@ static int mt2701_cs42448_machine_probe(struct platform_device *pdev) 
	int ret;

	int i;

	struct device_node *platform_node, *codec_node, *codec_node_bt_mrg;

	struct device *dev = &pdev->dev;

	struct mt2701_cs42448_private *priv =

		devm_kzalloc(&pdev->dev, sizeof(struct mt2701_cs42448_private),

		devm_kzalloc(dev, sizeof(struct mt2701_cs42448_private),

			     GFP_KERNEL);

	struct device *dev = &pdev->dev;

	struct snd_soc_dai_link *dai_link;



	if (!priv)
@@ -341,7 +341,7 @@ static int mt2701_cs42448_machine_probe(struct platform_device *pdev) 
	platform_node = of_parse_phandle(pdev->dev.of_node,

					 "mediatek,platform", 0);

	if (!platform_node) {

		dev_err(&pdev->dev, "Property 'platform' missing or invalid\n");

		dev_err(dev, "Property 'platform' missing or invalid\n");

		return -EINVAL;

	}

	for_each_card_prelinks(card, i, dai_link) {
@@ -355,7 +355,7 @@ static int mt2701_cs42448_machine_probe(struct platform_device *pdev) 
	codec_node = of_parse_phandle(pdev->dev.of_node,

				      "mediatek,audio-codec", 0);

	if (!codec_node) {

		dev_err(&pdev->dev,

		dev_err(dev,

			"Property 'audio-codec' missing or invalid\n");

		return -EINVAL;

	}
@@ -368,7 +368,7 @@ static int mt2701_cs42448_machine_probe(struct platform_device *pdev) 
	codec_node_bt_mrg = of_parse_phandle(pdev->dev.of_node,

					     "mediatek,audio-codec-bt-mrg", 0);

	if (!codec_node_bt_mrg) {

		dev_err(&pdev->dev,

		dev_err(dev,

			"Property 'audio-codec-bt-mrg' missing or invalid\n");

		return -EINVAL;

	}
@@ -377,7 +377,7 @@ static int mt2701_cs42448_machine_probe(struct platform_device *pdev) 


	ret = snd_soc_of_parse_audio_routing(card, "audio-routing");

	if (ret) {

		dev_err(&pdev->dev, "failed to parse audio-routing: %d\n", ret);

		dev_err(dev, "failed to parse audio-routing: %d\n", ret);

		return ret;

	}
@@ -395,10 +395,10 @@ static int mt2701_cs42448_machine_probe(struct platform_device *pdev) 


	snd_soc_card_set_drvdata(card, priv);



	ret = devm_snd_soc_register_card(&pdev->dev, card);

	ret = devm_snd_soc_register_card(dev, card);



	if (ret)

		dev_err(&pdev->dev, "%s snd_soc_register_card fail %d\n",

		dev_err(dev, "%s snd_soc_register_card fail %d\n",

			__func__, ret);

	return ret;

}