| From d195cb8da0880a5fbf1963bf3bab55a739270283 Mon Sep 17 00:00:00 2001 |
| From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> |
| Date: Wed, 15 Mar 2017 04:43:40 +0000 |
| Subject: [PATCH 130/286] ASoC: simple-scu-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> |
| (cherry picked from commit 40b68dac75a1d16266d3c89244ccf7b899afac3e) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| sound/soc/generic/simple-scu-card.c | 4 ++-- |
| 1 file changed, 2 insertions(+), 2 deletions(-) |
| |
| --- a/sound/soc/generic/simple-scu-card.c |
| +++ b/sound/soc/generic/simple-scu-card.c |
| @@ -257,7 +257,7 @@ static int asoc_simple_card_probe(struct |
| struct snd_soc_dai_link *dai_link; |
| struct asoc_simple_dai *dai_props; |
| struct device *dev = &pdev->dev; |
| - struct device_node *np = pdev->dev.of_node; |
| + struct device_node *np = dev->of_node; |
| int num, ret; |
| |
| /* Allocate the private data */ |
| @@ -292,7 +292,7 @@ static int asoc_simple_card_probe(struct |
| |
| 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: |
