ASoC: SPEAr spdif_{in,out}: use devm for clk and a few more cleanups

Drop dev_set_drvdata as this is handled in the core and use
devm_request_and_ioremap instead of devm_ioremap to properly register the
address range used

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

diff --git a/sound/soc/spear/spdif_in.c b/sound/soc/spear/spdif_in.c
index 82c838753c0694cd2108e7fe0b04f3796644261d..643ada6a1fa5cddb4b1c9f833acc5a040fe886b7 100644 (file)
--- a/sound/soc/spear/spdif_in.c
+++ b/sound/soc/spear/spdif_in.c
@@ -231,7 +231,7 @@ static int spdif_in_probe(struct platform_device *pdev)
        if (host->irq < 0)
                return -EINVAL;
 
-       host->clk = clk_get(&pdev->dev, NULL);
+       host->clk = devm_clk_get(&pdev->dev, NULL);
        if (IS_ERR(host->clk))
                return PTR_ERR(host->clk);
 
@@ -253,7 +253,6 @@ static int spdif_in_probe(struct platform_device *pdev)
        ret = devm_request_irq(&pdev->dev, host->irq, spdif_in_irq, 0,
                        "spdif-in", host);
        if (ret) {
-               clk_put(host->clk);
                dev_warn(&pdev->dev, "request_irq failed\n");
                return ret;
        }
@@ -273,14 +272,10 @@ static int spdif_in_remove(struct platform_device *pdev)
        struct spdif_in_dev *host = dev_get_drvdata(&pdev->dev);
 
        snd_soc_unregister_component(&pdev->dev);
-       dev_set_drvdata(&pdev->dev, NULL);
-
-       clk_put(host->clk);
 
        return 0;
 }
 
-
 static struct platform_driver spdif_in_driver = {
        .probe          = spdif_in_probe,
        .remove         = spdif_in_remove,

diff --git a/sound/soc/spear/spdif_out.c b/sound/soc/spear/spdif_out.c
index 12b4f2fcb9afcb0d33553d0674aa5fc045b0a1ef..fd25cc5efe277dedcdd7cf0e2c320c74ab846517 100644 (file)
--- a/sound/soc/spear/spdif_out.c
+++ b/sound/soc/spear/spdif_out.c
@@ -298,14 +298,14 @@ static int spdif_out_probe(struct platform_device *pdev)
                return -ENOMEM;
        }
 
-       host->io_base = devm_ioremap(&pdev->dev, res->start,
+       host->io_base = devm_request_and_ioremap(&pdev->dev, res->start,
                                resource_size(res));
        if (!host->io_base) {
                dev_warn(&pdev->dev, "ioremap failed\n");
                return -ENOMEM;
        }
 
-       host->clk = clk_get(&pdev->dev, NULL);
+       host->clk = devm_clk_get(&pdev->dev, NULL);
        if (IS_ERR(host->clk))
                return PTR_ERR(host->clk);
 
@@ -334,9 +334,6 @@ static int spdif_out_remove(struct platform_device *pdev)
        struct spdif_out_dev *host = dev_get_drvdata(&pdev->dev);
 
        snd_soc_unregister_component(&pdev->dev);
-       dev_set_drvdata(&pdev->dev, NULL);
-
-       clk_put(host->clk);
 
        return 0;
 }