niansa-misc/linux
1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

ASoC: mediatek: use of_device_get_match_data()

Browse source 
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>
This commit is contained in:
Tzung-Bi Shih 2021-12-27 14:21:53 +08:00 • committed by Mark Brown
parent 8f85317292
commit 3667a037e5
No known key found for this signature in database
GPG key ID: 24D68B725D5487D0
3 changed files with 6 additions and 15 deletions

7
sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c
View file

@ -685,7 +685,6 @@ static int mt8183_da7219_max98357_dev_probe(struct platform_device *pdev)
struct snd_soc_dai_link *dai_link; struct snd_soc_dai_link *dai_link;
struct mt8183_da7219_max98357_priv *priv; struct mt8183_da7219_max98357_priv *priv;
struct pinctrl *pinctrl; struct pinctrl *pinctrl;
const struct of_device_id *match;
int ret, i; int ret, i;
platform_node = of_parse_phandle(pdev->dev.of_node, 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; return -EINVAL;
} }
match = of_match_device(pdev->dev.driver->of_match_table, &pdev->dev); card = (struct snd_soc_card *)of_device_get_match_data(&pdev->dev);
if (!match || !match->data) if (!card)
return -EINVAL; return -EINVAL;
card = (struct snd_soc_card *)match->data;
card->dev = &pdev->dev; card->dev = &pdev->dev;
hdmi_codec = of_parse_phandle(pdev->dev.of_node, hdmi_codec = of_parse_phandle(pdev->dev.of_node,

7
sound/soc/mediatek/mt8183/mt8183-mt6358-ts3a227-max98357.c
View file

@ -637,7 +637,6 @@ mt8183_mt6358_ts3a227_max98357_dev_probe(struct platform_device *pdev)
struct device_node *platform_node, *ec_codec, *hdmi_codec; struct device_node *platform_node, *ec_codec, *hdmi_codec;
struct snd_soc_dai_link *dai_link; struct snd_soc_dai_link *dai_link;
struct mt8183_mt6358_ts3a227_max98357_priv *priv; struct mt8183_mt6358_ts3a227_max98357_priv *priv;
const struct of_device_id *match;
int ret, i; int ret, i;
platform_node = of_parse_phandle(pdev->dev.of_node, 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; return -EINVAL;
} }
match = of_match_device(pdev->dev.driver->of_match_table, &pdev->dev); card = (struct snd_soc_card *)of_device_get_match_data(&pdev->dev);
if (!match || !match->data) if (!card)
return -EINVAL; return -EINVAL;
card = (struct snd_soc_card *)match->data;
card->dev = &pdev->dev; card->dev = &pdev->dev;
ec_codec = of_parse_phandle(pdev->dev.of_node, "mediatek,ec-codec", 0); ec_codec = of_parse_phandle(pdev->dev.of_node, "mediatek,ec-codec", 0);

7
sound/soc/mediatek/mt8192/mt8192-mt6359-rt1015-rt5682.c
View file

@ -1106,7 +1106,6 @@ static int mt8192_mt6359_dev_probe(struct platform_device *pdev)
struct device_node *platform_node, *hdmi_codec; struct device_node *platform_node, *hdmi_codec;
int ret, i; int ret, i;
struct snd_soc_dai_link *dai_link; struct snd_soc_dai_link *dai_link;
const struct of_device_id *match;
struct mt8192_mt6359_priv *priv; struct mt8192_mt6359_priv *priv;
platform_node = of_parse_phandle(pdev->dev.of_node, 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; return -EINVAL;
} }
match = of_match_device(pdev->dev.driver->of_match_table, &pdev->dev); card = (struct snd_soc_card *)of_device_get_match_data(&pdev->dev);
if (!match || !match->data) if (!card)
return -EINVAL; return -EINVAL;
card = (struct snd_soc_card *)match->data;
card->dev = &pdev->dev; card->dev = &pdev->dev;
hdmi_codec = of_parse_phandle(pdev->dev.of_node, hdmi_codec = of_parse_phandle(pdev->dev.of_node,