1 files changed, 11 insertions, 36 deletions

diff --git a/sound/soc/tegra/tegra20_spdif.c b/sound/soc/tegra/tegra20_spdif.c
index 9141477a528d..a0c3640572b9 100644
--- a/sound/soc/tegra/tegra20_spdif.c
+++ b/sound/soc/tegra/tegra20_spdif.c
@@ -265,7 +265,7 @@ static const struct regmap_config tegra20_spdif_regmap_config = {
 static int tegra20_spdif_platform_probe(struct platform_device *pdev)
 {
         struct tegra20_spdif *spdif;
-        struct resource *mem, *memregion, *dmareq;
+        struct resource *mem, *dmareq;
         void __iomem *regs;
         int ret;
 
@@ -273,45 +273,26 @@ static int tegra20_spdif_platform_probe(struct platform_device *pdev)
                              GFP_KERNEL);
         if (!spdif) {
                 dev_err(&pdev->dev, "Can't allocate tegra20_spdif\n");
-                ret = -ENOMEM;
-                goto err;
+                return -ENOMEM;
         }
         dev_set_drvdata(&pdev->dev, spdif);
 
-        spdif->clk_spdif_out = clk_get(&pdev->dev, "spdif_out");
+        spdif->clk_spdif_out = devm_clk_get(&pdev->dev, "spdif_out");
         if (IS_ERR(spdif->clk_spdif_out)) {
                 pr_err("Can't retrieve spdif clock\n");
                 ret = PTR_ERR(spdif->clk_spdif_out);
-                goto err;
+                return ret;
         }
 
         mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-        if (!mem) {
-                dev_err(&pdev->dev, "No memory resource\n");
-                ret = -ENODEV;
-                goto err_clk_put;
-        }
+        regs = devm_ioremap_resource(&pdev->dev, mem);
+        if (IS_ERR(regs))
+                return PTR_ERR(regs);
 
         dmareq = platform_get_resource(pdev, IORESOURCE_DMA, 0);
         if (!dmareq) {
                 dev_err(&pdev->dev, "No DMA resource\n");
-                ret = -ENODEV;
-                goto err_clk_put;
-        }
-
-        memregion = devm_request_mem_region(&pdev->dev, mem->start,
-                                            resource_size(mem), DRV_NAME);
-        if (!memregion) {
-                dev_err(&pdev->dev, "Memory region already claimed\n");
-                ret = -EBUSY;
-                goto err_clk_put;
-        }
-
-        regs = devm_ioremap(&pdev->dev, mem->start, resource_size(mem));
-        if (!regs) {
-                dev_err(&pdev->dev, "ioremap failed\n");
-                ret = -ENOMEM;
-                goto err_clk_put;
+                return -ENODEV;
         }
 
         spdif->regmap = devm_regmap_init_mmio(&pdev->dev, regs,
@@ -319,7 +300,7 @@ static int tegra20_spdif_platform_probe(struct platform_device *pdev)
         if (IS_ERR(spdif->regmap)) {
                 dev_err(&pdev->dev, "regmap init failed\n");
                 ret = PTR_ERR(spdif->regmap);
-                goto err_clk_put;
+                return ret;
         }
 
         spdif->playback_dma_data.addr = mem->start + TEGRA20_SPDIF_DATA_OUT;
@@ -335,7 +316,7 @@ static int tegra20_spdif_platform_probe(struct platform_device *pdev)
         }
 
         ret = snd_soc_register_component(&pdev->dev, &tegra20_spdif_component,
-                                   &tegra20_spdif_dai, 1);
+                                         &tegra20_spdif_dai, 1);
         if (ret) {
                 dev_err(&pdev->dev, "Could not register DAI: %d\n", ret);
                 ret = -ENOMEM;
@@ -357,16 +338,12 @@ err_suspend:
                 tegra20_spdif_runtime_suspend(&pdev->dev);
 err_pm_disable:
         pm_runtime_disable(&pdev->dev);
-err_clk_put:
-        clk_put(spdif->clk_spdif_out);
-err:
+
         return ret;
 }
 
 static int tegra20_spdif_platform_remove(struct platform_device *pdev)
 {
-        struct tegra20_spdif *spdif = dev_get_drvdata(&pdev->dev);
-
         pm_runtime_disable(&pdev->dev);
         if (!pm_runtime_status_suspended(&pdev->dev))
                 tegra20_spdif_runtime_suspend(&pdev->dev);
@@ -374,8 +351,6 @@ static int tegra20_spdif_platform_remove(struct platform_device *pdev)
         tegra_pcm_platform_unregister(&pdev->dev);
         snd_soc_unregister_component(&pdev->dev);
 
-        clk_put(spdif->clk_spdif_out);
-
         return 0;
 }