diff options
| author | Andrew Jackson <Andrew.Jackson@arm.com> | 2014-12-12 10:25:00 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2014-12-22 14:59:52 +0100 |
| commit | be33465e58ab3a3300c5182844d45c67e73b15e0 (patch) | |
| tree | 290f204346989d57661863b52c99c3f0354f9813 /sound/soc | |
| parent | Linux 3.19-rc1 (diff) | |
| download | linux-be33465e58ab3a3300c5182844d45c67e73b15e0.tar.xz linux-be33465e58ab3a3300c5182844d45c67e73b15e0.zip | |
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')
| -rw-r--r-- | sound/soc/dwc/designware_i2s.c | 13 |
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) } dw_i2s_dai = devm_kzalloc(&pdev->dev, sizeof(*dw_i2s_dai), GFP_KERNEL); - if (!dw_i2s_dai) { - dev_err(&pdev->dev, "mem allocation failed for dai driver\n"); + if (!dw_i2s_dai) return -ENOMEM; - } dw_i2s_dai->ops = &dw_i2s_dai_ops; dw_i2s_dai->suspend = dw_i2s_suspend; dw_i2s_dai->resume = dw_i2s_resume; res = platform_get_resource(pdev, IORESOURCE_MEM, 0); - if (!res) { - dev_err(&pdev->dev, "no i2s resource defined\n"); - return -ENODEV; - } - dev->i2s_base = devm_ioremap_resource(&pdev->dev, res); - if (IS_ERR(dev->i2s_base)) { - dev_err(&pdev->dev, "ioremap fail for i2s_region\n"); + if (IS_ERR(dev->i2s_base)) return PTR_ERR(dev->i2s_base); - } cap = pdata->cap; dev->capability = cap; |