]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
ASoC: simple-card: use defined dev on probe()
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Wed, 15 Mar 2017 04:43:21 +0000 (04:43 +0000)
committerMark Brown <broonie@kernel.org>
Thu, 16 Mar 2017 14:10:36 +0000 (14:10 +0000)
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>
sound/soc/generic/simple-card.c

index a385ff6bfa4b3acbc1809176cd23eb6d4e0c5eb6..9ad05e237ee0a2c6f79a01f73efec1120a40af82 100644 (file)
@@ -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: