ASoC: dwc: Allocate resources with devm_ioremap_resource

Prepare for the introduction of device-tree support by re-ordering some
of the allocations and using devm_iomap_resource to simplify IO mapping.

Signed-off-by: Andrew Jackson <Andrew.Jackson@arm.com>
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/dwc/designware_i2s.c b/sound/soc/dwc/designware_i2s.c
index e961388e6e9c07ce3b5b7249d464538e5d418ea0..08f0229f8d6836313db1dcc0a53ffc9a83580f4b 100644 (file)
--- a/sound/soc/dwc/designware_i2s.c
+++ b/sound/soc/dwc/designware_i2s.c
@@ -338,31 +338,34 @@ static int dw_i2s_probe(struct platform_device *pdev)
                return -EINVAL;
        }
 
-       res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-       if (!res) {
-               dev_err(&pdev->dev, "no i2s resource defined\n");
-               return -ENODEV;
-       }
-
-       if (!devm_request_mem_region(&pdev->dev, res->start,
-                               resource_size(res), pdev->name)) {
-               dev_err(&pdev->dev, "i2s region already claimed\n");
-               return -EBUSY;
-       }
-
        dev = devm_kzalloc(&pdev->dev, sizeof(*dev), GFP_KERNEL);
        if (!dev) {
                dev_warn(&pdev->dev, "kzalloc fail\n");
                return -ENOMEM;
        }
 
-       dev->i2s_base = devm_ioremap(&pdev->dev, res->start,
-                       resource_size(res));
-       if (!dev->i2s_base) {
-               dev_err(&pdev->dev, "ioremap fail for i2s_region\n");
+       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");
                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");
+               return PTR_ERR(dev->i2s_base);
+       }
+
        cap = pdata->cap;
        dev->capability = cap;
        dev->i2s_clk_cfg = pdata->i2s_clk_cfg;
@@ -388,13 +391,6 @@ static int dw_i2s_probe(struct platform_device *pdev)
        if (ret < 0)
                goto err_clk_put;
 
-       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");
-               ret = -ENOMEM;
-               goto err_clk_disable;
-       }
-
        if (cap & DWC_I2S_PLAY) {
                dev_dbg(&pdev->dev, " designware: play supported\n");
                dw_i2s_dai->playback.channels_min = MIN_CHANNEL_NUM;
@@ -411,10 +407,6 @@ static int dw_i2s_probe(struct platform_device *pdev)
                dw_i2s_dai->capture.rates = pdata->snd_rates;
        }
 
-       dw_i2s_dai->ops = &dw_i2s_dai_ops;
-       dw_i2s_dai->suspend = dw_i2s_suspend;
-       dw_i2s_dai->resume = dw_i2s_resume;
-
        dev->dev = &pdev->dev;
        dev_set_drvdata(&pdev->dev, dev);
        ret = snd_soc_register_component(&pdev->dev, &dw_i2s_component,