Unverified Commit bd8bec14 authored by Trevor Wu's avatar Trevor Wu Committed by Mark Brown
Browse files

ASoC: mediatek: mt8195: move of_node_put to remove function 



platforms->of_node and codes->of_node are assigned in probe function,
and of_node_put is called at the end of probe function, because of_node
seems to be not used after probe functon

In this patch, of_node_put is moved to platform remove function in case
of_node is used at any occasions after probe function in the future.

Signed-off-by: default avatarTrevor Wu <trevor.wu@mediatek.com>
Link: https://lore.kernel.org/r/20211001031601.3953-1-trevor.wu@mediatek.com


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

sound/soc/mediatek/mt8195/mt8195-mt6359-rt1019-rt5682.c

+42 −27
Original line number Diff line number Diff line
@@ -26,6 +26,9 @@ 
#define RT5682_DEV0_NAME	"rt5682.2-001a"



struct mt8195_mt6359_rt1019_rt5682_priv {

	struct device_node *platform_node;

	struct device_node *hdmi_node;

	struct device_node *dp_node;

	struct snd_soc_jack headset_jack;

	struct snd_soc_jack dp_jack;

	struct snd_soc_jack hdmi_jack;
@@ -995,33 +998,36 @@ static struct snd_soc_card mt8195_mt6359_rt1019_rt5682_soc_card = { 
static int mt8195_mt6359_rt1019_rt5682_dev_probe(struct platform_device *pdev)

{

	struct snd_soc_card *card = &mt8195_mt6359_rt1019_rt5682_soc_card;

	struct device_node *platform_node;

	struct device_node *dp_node;

	struct device_node *hdmi_node;

	struct snd_soc_dai_link *dai_link;

	struct mt8195_mt6359_rt1019_rt5682_priv *priv = NULL;

	struct mt8195_mt6359_rt1019_rt5682_priv *priv;

	int ret, i;



	card->dev = &pdev->dev;



	platform_node = of_parse_phandle(pdev->dev.of_node,

	priv = devm_kzalloc(&pdev->dev, sizeof(*priv), GFP_KERNEL);

	if (!priv)

		return -ENOMEM;



	priv->platform_node = of_parse_phandle(pdev->dev.of_node,

					       "mediatek,platform", 0);

	if (!platform_node) {

	if (!priv->platform_node) {

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

		return -EINVAL;

	}



	for_each_card_prelinks(card, i, dai_link) {

		if (!dai_link->platforms->name)

			dai_link->platforms->of_node = platform_node;

			dai_link->platforms->of_node = priv->platform_node;



		if (strcmp(dai_link->name, "DPTX_BE") == 0) {

			dp_node = of_parse_phandle(pdev->dev.of_node,

			priv->dp_node =

				of_parse_phandle(pdev->dev.of_node,

						 "mediatek,dptx-codec", 0);

			if (!dp_node) {



			if (!priv->dp_node) {

				dev_dbg(&pdev->dev, "No property 'dptx-codec'\n");

			} else {

				dai_link->codecs->of_node = dp_node;

				dai_link->codecs->of_node = priv->dp_node;

				dai_link->codecs->name = NULL;

				dai_link->codecs->dai_name = "i2s-hifi";

				dai_link->init = mt8195_dptx_codec_init;
@@ -1029,12 +1035,13 @@ static int mt8195_mt6359_rt1019_rt5682_dev_probe(struct platform_device *pdev) 
		}



		if (strcmp(dai_link->name, "ETDM3_OUT_BE") == 0) {

			hdmi_node = of_parse_phandle(pdev->dev.of_node,

			priv->hdmi_node =

				of_parse_phandle(pdev->dev.of_node,

						 "mediatek,hdmi-codec", 0);

			if (!hdmi_node) {

			if (!priv->hdmi_node) {

				dev_dbg(&pdev->dev, "No property 'hdmi-codec'\n");

			} else {

				dai_link->codecs->of_node = hdmi_node;

				dai_link->codecs->of_node = priv->hdmi_node;

				dai_link->codecs->name = NULL;

				dai_link->codecs->dai_name = "i2s-hifi";

				dai_link->init = mt8195_hdmi_codec_init;
@@ -1042,26 +1049,33 @@ static int mt8195_mt6359_rt1019_rt5682_dev_probe(struct platform_device *pdev) 
		}

	}



	priv = devm_kzalloc(&pdev->dev, sizeof(*priv), GFP_KERNEL);

	if (!priv) {

		ret = -ENOMEM;

		goto out;

	}



	snd_soc_card_set_drvdata(card, priv);



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

	if (ret)

	if (ret) {

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

			__func__, ret);

		of_node_put(priv->hdmi_node);

		of_node_put(priv->dp_node);

		of_node_put(priv->platform_node);

	}



out:

	of_node_put(hdmi_node);

	of_node_put(dp_node);

	of_node_put(platform_node);

	return ret;

}



static int mt8195_mt6359_rt1019_rt5682_dev_remove(struct platform_device *pdev)

{

	struct snd_soc_card *card = platform_get_drvdata(pdev);

	struct mt8195_mt6359_rt1019_rt5682_priv *priv =

		snd_soc_card_get_drvdata(card);



	of_node_put(priv->hdmi_node);

	of_node_put(priv->dp_node);

	of_node_put(priv->platform_node);



	return 0;

}



#ifdef CONFIG_OF

static const struct of_device_id mt8195_mt6359_rt1019_rt5682_dt_match[] = {

	{.compatible = "mediatek,mt8195_mt6359_rt1019_rt5682",},
@@ -1083,6 +1097,7 @@ static struct platform_driver mt8195_mt6359_rt1019_rt5682_driver = { 
		.pm = &mt8195_mt6359_rt1019_rt5682_pm_ops,

	},

	.probe = mt8195_mt6359_rt1019_rt5682_dev_probe,

	.remove = mt8195_mt6359_rt1019_rt5682_dev_remove,

};



module_platform_driver(mt8195_mt6359_rt1019_rt5682_driver);