aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/generic
diff options
context:
space:
mode:
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>2012-12-26 01:52:33 -0500
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-12-27 11:51:16 -0500
commitf89983ef61677afc828ed32b3c42ef5a71eb0686 (patch)
tree79b6c69886f907db33c593f9252d2630f57432a9 /sound/soc/generic
parenta49f0d1ea3ec94fc7cf33a7c36a16343b74bd565 (diff)
ASoC: simple-card: use struct device pointer for dev_xxx()
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/generic')
-rw-r--r--sound/soc/generic/simple-card.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/sound/soc/generic/simple-card.c b/sound/soc/generic/simple-card.c
index b4b4cab30232..bc050ec8680a 100644
--- a/sound/soc/generic/simple-card.c
+++ b/sound/soc/generic/simple-card.c
@@ -50,9 +50,10 @@ static int asoc_simple_card_dai_init(struct snd_soc_pcm_runtime *rtd)
50static int asoc_simple_card_probe(struct platform_device *pdev) 50static int asoc_simple_card_probe(struct platform_device *pdev)
51{ 51{
52 struct asoc_simple_card_info *cinfo = pdev->dev.platform_data; 52 struct asoc_simple_card_info *cinfo = pdev->dev.platform_data;
53 struct device *dev = &pdev->dev;
53 54
54 if (!cinfo) { 55 if (!cinfo) {
55 dev_err(&pdev->dev, "no info for asoc-simple-card\n"); 56 dev_err(dev, "no info for asoc-simple-card\n");
56 return -EINVAL; 57 return -EINVAL;
57 } 58 }
58 59
@@ -62,7 +63,7 @@ static int asoc_simple_card_probe(struct platform_device *pdev)
62 !cinfo->codec || 63 !cinfo->codec ||
63 !cinfo->platform || 64 !cinfo->platform ||
64 !cinfo->codec_dai) { 65 !cinfo->codec_dai) {
65 dev_err(&pdev->dev, "insufficient asoc_simple_card_info settings\n"); 66 dev_err(dev, "insufficient asoc_simple_card_info settings\n");
66 return -EINVAL; 67 return -EINVAL;
67 } 68 }
68 69