[alsa-devel] [PATCH] 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 --- sound/soc/spear/spdif_in.c | 17 ++--------------- sound/soc/spear/spdif_out.c | 17 +++-------------- 2 files changed, 5 insertions(+), 29 deletions(-)

diff --git a/sound/soc/spear/spdif_in.c b/sound/soc/spear/spdif_in.c index c7c4b20..d40bb34 100644 --- 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,33 +253,20 @@ 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; }

- ret = snd_soc_register_dai(&pdev->dev, &spdif_in_dai); - if (ret != 0) { - clk_put(host->clk); - return ret; - } - - return 0; + return snd_soc_register_dai(&pdev->dev, &spdif_in_dai); }

static int spdif_in_remove(struct platform_device *pdev) { - struct spdif_in_dev *host = dev_get_drvdata(&pdev->dev); - snd_soc_unregister_dai(&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 5eac4cd..b2488b4 100644 --- a/sound/soc/spear/spdif_out.c +++ b/sound/soc/spear/spdif_out.c @@ -293,14 +293,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);

@@ -314,23 +314,12 @@ static int spdif_out_probe(struct platform_device *pdev)

dev_set_drvdata(&pdev->dev, host);

- ret = snd_soc_register_dai(&pdev->dev, &spdif_out_dai); - if (ret != 0) { - clk_put(host->clk); - return ret; - } - - return 0; + return snd_soc_register_dai(&pdev->dev, &spdif_out_dai); }

static int spdif_out_remove(struct platform_device *pdev) { - struct spdif_out_dev *host = dev_get_drvdata(&pdev->dev); - snd_soc_unregister_dai(&pdev->dev); - dev_set_drvdata(&pdev->dev, NULL); - - clk_put(host->clk);

return 0; }