Merge tag 'asoc-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-next

ASoC: Updates for v3.7

Lots and lots of driver specific cleanups and enhancements but the only
substantial framework feature this time round is the compressed API
binding:

- Addition of ASoC bindings for the compressed API, used by the mid-x86
  drivers.
- Lots of cleanups and API refreshes for CODEC drivers and DaVinci.
- Conversion of OMAP to dmaengine.
- New machine driver for Wolfson Microelectronics Bells.
- New CODEC driver for Wolfson Microelectronics WM0010.

1 files changed, 9 insertions, 19 deletions

diff --git a/sound/soc/sh/fsi.c b/sound/soc/sh/fsi.c
index 0540408a9fa9..5328ae5539f1 100644
--- a/sound/soc/sh/fsi.c
+++ b/sound/soc/sh/fsi.c
@@ -1655,22 +1655,20 @@ static int fsi_probe(struct platform_device *pdev)
         irq = platform_get_irq(pdev, 0);
         if (!res || (int)irq <= 0) {
                 dev_err(&pdev->dev, "Not enough FSI platform resources.\n");
-                ret = -ENODEV;
-                goto exit;
+                return -ENODEV;
         }
 
-        master = kzalloc(sizeof(*master), GFP_KERNEL);
+        master = devm_kzalloc(&pdev->dev, sizeof(*master), GFP_KERNEL);
         if (!master) {
                 dev_err(&pdev->dev, "Could not allocate master\n");
-                ret = -ENOMEM;
-                goto exit;
+                return -ENOMEM;
         }
 
-        master->base = ioremap_nocache(res->start, resource_size(res));
+        master->base = devm_ioremap_nocache(&pdev->dev,
+                                            res->start, resource_size(res));
         if (!master->base) {
-                ret = -ENXIO;
                 dev_err(&pdev->dev, "Unable to ioremap FSI registers.\n");
-                goto exit_kfree;
+                return -ENXIO;
         }
 
         /* master setting */
@@ -1686,7 +1684,7 @@ static int fsi_probe(struct platform_device *pdev)
         ret = fsi_stream_probe(&master->fsia, &pdev->dev);
         if (ret < 0) {
                 dev_err(&pdev->dev, "FSIA stream probe failed\n");
-                goto exit_iounmap;
+                return ret;
         }
 
         /* FSI B setting */
@@ -1730,16 +1728,11 @@ exit_snd_soc:
 exit_free_irq:
         free_irq(irq, master);
 exit_fsib:
+        pm_runtime_disable(&pdev->dev);
         fsi_stream_remove(&master->fsib);
 exit_fsia:
         fsi_stream_remove(&master->fsia);
-exit_iounmap:
-        iounmap(master->base);
-        pm_runtime_disable(&pdev->dev);
-exit_kfree:
-        kfree(master);
-        master = NULL;
-exit:
+
         return ret;
 }
 
@@ -1758,9 +1751,6 @@ static int fsi_remove(struct platform_device *pdev)
         fsi_stream_remove(&master->fsia);
         fsi_stream_remove(&master->fsib);
 
-        iounmap(master->base);
-        kfree(master);
-
         return 0;
 }