diff options
| author | Mark Brown <broonie@linaro.org> | 2013-06-26 07:18:39 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-06-27 04:45:06 -0400 |
| commit | 2def2516aad75d73e899ee952754a89774d5b935 (patch) | |
| tree | 32f739d110c723396b0e27b0f6f3a08fddbf3e7f | |
| parent | cfe68642cff7c121f38a088a795759fd3500122c (diff) | |
ASoC: tegra20-ac97: Convert to devm_ioremap_resource()
Acked-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
| -rw-r--r-- | sound/soc/tegra/tegra20_ac97.c | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/sound/soc/tegra/tegra20_ac97.c b/sound/soc/tegra/tegra20_ac97.c index d8c142dc93e4..9043626da6fa 100644 --- a/sound/soc/tegra/tegra20_ac97.c +++ b/sound/soc/tegra/tegra20_ac97.c | |||
| @@ -341,18 +341,10 @@ static int tegra20_ac97_platform_probe(struct platform_device *pdev) | |||
| 341 | goto err_clk_put; | 341 | goto err_clk_put; |
| 342 | } | 342 | } |
| 343 | 343 | ||
| 344 | memregion = devm_request_mem_region(&pdev->dev, mem->start, | 344 | regs = devm_ioremap_resource(&pdev->dev, mem); |
| 345 | resource_size(mem), DRV_NAME); | 345 | if (IS_ERR(regs)) { |
| 346 | if (!memregion) { | 346 | ret = PTR_ERR(regs); |
| 347 | dev_err(&pdev->dev, "Memory region already claimed\n"); | 347 | dev_err(&pdev->dev, "ioremap failed: %d\n", ret); |
| 348 | ret = -EBUSY; | ||
| 349 | goto err_clk_put; | ||
| 350 | } | ||
| 351 | |||
| 352 | regs = devm_ioremap(&pdev->dev, mem->start, resource_size(mem)); | ||
| 353 | if (!regs) { | ||
| 354 | dev_err(&pdev->dev, "ioremap failed\n"); | ||
| 355 | ret = -ENOMEM; | ||
| 356 | goto err_clk_put; | 348 | goto err_clk_put; |
| 357 | } | 349 | } |
| 358 | 350 | ||
