aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/dwc
diff options
context:
space:
mode:
authorAndrew Jackson <Andrew.Jackson@arm.com>2014-12-12 04:25:00 -0500
committerMark Brown <broonie@kernel.org>2014-12-22 08:59:52 -0500
commitbe33465e58ab3a3300c5182844d45c67e73b15e0 (patch)
tree290f204346989d57661863b52c99c3f0354f9813 /sound/soc/dwc
parent97bf6af1f928216fd6c5a66e8a57bfa95a659672 (diff)
ASoC: dwc: Remove unnecessary debug messages and tests
The devm_XXX allocation functions print a message on failure, so additional messages are not required. Signed-off-by: Andrew Jackson <Andrew.Jackson@arm.com> Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/dwc')
-rw-r--r--sound/soc/dwc/designware_i2s.c13
1 files changed, 2 insertions, 11 deletions
diff --git a/sound/soc/dwc/designware_i2s.c b/sound/soc/dwc/designware_i2s.c
index b93168d4f648..f81e747c1c12 100644
--- a/sound/soc/dwc/designware_i2s.c
+++ b/sound/soc/dwc/designware_i2s.c
@@ -345,26 +345,17 @@ static int dw_i2s_probe(struct platform_device *pdev)
345 } 345 }
346 346
347 dw_i2s_dai = devm_kzalloc(&pdev->dev, sizeof(*dw_i2s_dai), GFP_KERNEL); 347 dw_i2s_dai = devm_kzalloc(&pdev->dev, sizeof(*dw_i2s_dai), GFP_KERNEL);
348 if (!dw_i2s_dai) { 348 if (!dw_i2s_dai)
349 dev_err(&pdev->dev, "mem allocation failed for dai driver\n");
350 return -ENOMEM; 349 return -ENOMEM;
351 }
352 350
353 dw_i2s_dai->ops = &dw_i2s_dai_ops; 351 dw_i2s_dai->ops = &dw_i2s_dai_ops;
354 dw_i2s_dai->suspend = dw_i2s_suspend; 352 dw_i2s_dai->suspend = dw_i2s_suspend;
355 dw_i2s_dai->resume = dw_i2s_resume; 353 dw_i2s_dai->resume = dw_i2s_resume;
356 354
357 res = platform_get_resource(pdev, IORESOURCE_MEM, 0); 355 res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
358 if (!res) {
359 dev_err(&pdev->dev, "no i2s resource defined\n");
360 return -ENODEV;
361 }
362
363 dev->i2s_base = devm_ioremap_resource(&pdev->dev, res); 356 dev->i2s_base = devm_ioremap_resource(&pdev->dev, res);
364 if (IS_ERR(dev->i2s_base)) { 357 if (IS_ERR(dev->i2s_base))
365 dev_err(&pdev->dev, "ioremap fail for i2s_region\n");
366 return PTR_ERR(dev->i2s_base); 358 return PTR_ERR(dev->i2s_base);
367 }
368 359
369 cap = pdata->cap; 360 cap = pdata->cap;
370 dev->capability = cap; 361 dev->capability = cap;