summaryrefslogtreecommitdiffstats
path: root/sound/soc
diff options
context:
space:
mode:
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>2017-03-15 04:43:21 +0000
committerMark Brown <broonie@kernel.org>2017-03-16 14:10:36 +0000
commitdcee9bfe8904518266c95d44a4f435a5f1fa59a1 (patch)
tree5c4f6214657fb80d80500804294d712cc96107b5 /sound/soc
parenta5de5b74a50113564a1e0850e2da96c37c35e55d (diff)
downloadlinux-dcee9bfe8904518266c95d44a4f435a5f1fa59a1.tar.gz
linux-dcee9bfe8904518266c95d44a4f435a5f1fa59a1.tar.bz2
linux-dcee9bfe8904518266c95d44a4f435a5f1fa59a1.zip
ASoC: simple-card: use defined dev on probe()
Current asoc_simple_card_probe() already has dev definition, but some place doesn't use it. Let's fix this issue. Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc')
-rw-r--r--sound/soc/generic/simple-card.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/generic/simple-card.c b/sound/soc/generic/simple-card.c
index a385ff6bfa4b..9ad05e237ee0 100644
--- a/sound/soc/generic/simple-card.c
+++ b/sound/soc/generic/simple-card.c
@@ -418,8 +418,8 @@ static int asoc_simple_card_probe(struct platform_device *pdev)
struct simple_card_data *priv;
struct snd_soc_dai_link *dai_link;
struct simple_dai_props *dai_props;
- struct device_node *np = pdev->dev.of_node;
struct device *dev = &pdev->dev;
+ struct device_node *np = dev->of_node;
int num, ret;
/* Get the number of DAI links */
@@ -491,7 +491,7 @@ static int asoc_simple_card_probe(struct platform_device *pdev)
snd_soc_card_set_drvdata(&priv->snd_card, priv);
- ret = devm_snd_soc_register_card(&pdev->dev, &priv->snd_card);
+ ret = devm_snd_soc_register_card(dev, &priv->snd_card);
if (ret >= 0)
return ret;
err: