ASoC: mediatek: use of_device_get_match_data()

[ Upstream commit 3667a037e50a31555276a7989435126e501f0f15 ]

Uses of_device_get_match_data() helper to clean some boilerplate code.

Signed-off-by: Tzung-Bi Shih <tzungbi@google.com>
Link: https://lore.kernel.org/r/20211227062153.3887447-1-tzungbi@google.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c b/sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c
index bda103211e0bd1c18b80fa86d9092cf38376c914..0ab8b050b305f02baaefcf0844b18274aade7851 100644 (file)
--- a/sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c
+++ b/sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c
@@ -685,7 +685,6 @@ static int mt8183_da7219_max98357_dev_probe(struct platform_device *pdev)
        struct snd_soc_dai_link *dai_link;
        struct mt8183_da7219_max98357_priv *priv;
        struct pinctrl *pinctrl;
-       const struct of_device_id *match;
        int ret, i;
 
        platform_node = of_parse_phandle(pdev->dev.of_node,
@@ -695,11 +694,9 @@ static int mt8183_da7219_max98357_dev_probe(struct platform_device *pdev)
                return -EINVAL;
        }
 
-       match = of_match_device(pdev->dev.driver->of_match_table, &pdev->dev);
-       if (!match || !match->data)
+       card = (struct snd_soc_card *)of_device_get_match_data(&pdev->dev);
+       if (!card)
                return -EINVAL;
-
-       card = (struct snd_soc_card *)match->data;
        card->dev = &pdev->dev;
 
        hdmi_codec = of_parse_phandle(pdev->dev.of_node,

diff --git a/sound/soc/mediatek/mt8183/mt8183-mt6358-ts3a227-max98357.c b/sound/soc/mediatek/mt8183/mt8183-mt6358-ts3a227-max98357.c
index c7b10c48c6c22089578a0266d1e1f5da06055afc..a56c1e87d5642220b88821ee2dd6b12d8356b986 100644 (file)
--- a/sound/soc/mediatek/mt8183/mt8183-mt6358-ts3a227-max98357.c
+++ b/sound/soc/mediatek/mt8183/mt8183-mt6358-ts3a227-max98357.c
@@ -637,7 +637,6 @@ mt8183_mt6358_ts3a227_max98357_dev_probe(struct platform_device *pdev)
        struct device_node *platform_node, *ec_codec, *hdmi_codec;
        struct snd_soc_dai_link *dai_link;
        struct mt8183_mt6358_ts3a227_max98357_priv *priv;
-       const struct of_device_id *match;
        int ret, i;
 
        platform_node = of_parse_phandle(pdev->dev.of_node,
@@ -647,11 +646,9 @@ mt8183_mt6358_ts3a227_max98357_dev_probe(struct platform_device *pdev)
                return -EINVAL;
        }
 
-       match = of_match_device(pdev->dev.driver->of_match_table, &pdev->dev);
-       if (!match || !match->data)
+       card = (struct snd_soc_card *)of_device_get_match_data(&pdev->dev);
+       if (!card)
                return -EINVAL;
-
-       card = (struct snd_soc_card *)match->data;
        card->dev = &pdev->dev;
 
        ec_codec = of_parse_phandle(pdev->dev.of_node, "mediatek,ec-codec", 0);

diff --git a/sound/soc/mediatek/mt8192/mt8192-mt6359-rt1015-rt5682.c b/sound/soc/mediatek/mt8192/mt8192-mt6359-rt1015-rt5682.c
index 24a5d0adec1babbee1ed779c026d342b101e8a30..ab449d0e4e9b2b92c5f57f88b656e9632f77d93f 100644 (file)
--- a/sound/soc/mediatek/mt8192/mt8192-mt6359-rt1015-rt5682.c
+++ b/sound/soc/mediatek/mt8192/mt8192-mt6359-rt1015-rt5682.c
@@ -1106,7 +1106,6 @@ static int mt8192_mt6359_dev_probe(struct platform_device *pdev)
        struct device_node *platform_node, *hdmi_codec;
        int ret, i;
        struct snd_soc_dai_link *dai_link;
-       const struct of_device_id *match;
        struct mt8192_mt6359_priv *priv;
 
        platform_node = of_parse_phandle(pdev->dev.of_node,
@@ -1116,11 +1115,9 @@ static int mt8192_mt6359_dev_probe(struct platform_device *pdev)
                return -EINVAL;
        }
 
-       match = of_match_device(pdev->dev.driver->of_match_table, &pdev->dev);
-       if (!match || !match->data)
+       card = (struct snd_soc_card *)of_device_get_match_data(&pdev->dev);
+       if (!card)
                return -EINVAL;
-
-       card = (struct snd_soc_card *)match->data;
        card->dev = &pdev->dev;
 
        hdmi_codec = of_parse_phandle(pdev->dev.of_node,