aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>2012-10-03 02:22:57 -0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-10-14 22:25:55 -0400
commit1ddd82868cc888e008ed520465c172a6cdddd689 (patch)
tree988df4f253fbfc354ea470f48a141254baf356fe
parent2a8c8a569ff3631f6b6d82ea17c57b9f064b2a7b (diff)
ASoC: fsi: use devm_request_irq()
This patch uses devm_request_irq() instead of request_irq() and removed free_irq() from driver Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
-rw-r--r--sound/soc/sh/fsi.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/sound/soc/sh/fsi.c b/sound/soc/sh/fsi.c
index c9927a22148e..1bd0df060afa 100644
--- a/sound/soc/sh/fsi.c
+++ b/sound/soc/sh/fsi.c
@@ -1701,7 +1701,7 @@ static int fsi_probe(struct platform_device *pdev)
1701 pm_runtime_enable(&pdev->dev); 1701 pm_runtime_enable(&pdev->dev);
1702 dev_set_drvdata(&pdev->dev, master); 1702 dev_set_drvdata(&pdev->dev, master);
1703 1703
1704 ret = request_irq(irq, &fsi_interrupt, 0, 1704 ret = devm_request_irq(&pdev->dev, irq, &fsi_interrupt, 0,
1705 id_entry->name, master); 1705 id_entry->name, master);
1706 if (ret) { 1706 if (ret) {
1707 dev_err(&pdev->dev, "irq request err\n"); 1707 dev_err(&pdev->dev, "irq request err\n");
@@ -1711,7 +1711,7 @@ static int fsi_probe(struct platform_device *pdev)
1711 ret = snd_soc_register_platform(&pdev->dev, &fsi_soc_platform); 1711 ret = snd_soc_register_platform(&pdev->dev, &fsi_soc_platform);
1712 if (ret < 0) { 1712 if (ret < 0) {
1713 dev_err(&pdev->dev, "cannot snd soc register\n"); 1713 dev_err(&pdev->dev, "cannot snd soc register\n");
1714 goto exit_free_irq; 1714 goto exit_fsib;
1715 } 1715 }
1716 1716
1717 ret = snd_soc_register_dais(&pdev->dev, fsi_soc_dai, 1717 ret = snd_soc_register_dais(&pdev->dev, fsi_soc_dai,
@@ -1725,8 +1725,6 @@ static int fsi_probe(struct platform_device *pdev)
1725 1725
1726exit_snd_soc: 1726exit_snd_soc:
1727 snd_soc_unregister_platform(&pdev->dev); 1727 snd_soc_unregister_platform(&pdev->dev);
1728exit_free_irq:
1729 free_irq(irq, master);
1730exit_fsib: 1728exit_fsib:
1731 pm_runtime_disable(&pdev->dev); 1729 pm_runtime_disable(&pdev->dev);
1732 fsi_stream_remove(&master->fsib); 1730 fsi_stream_remove(&master->fsib);
@@ -1742,7 +1740,6 @@ static int fsi_remove(struct platform_device *pdev)
1742 1740
1743 master = dev_get_drvdata(&pdev->dev); 1741 master = dev_get_drvdata(&pdev->dev);
1744 1742
1745 free_irq(master->irq, master);
1746 pm_runtime_disable(&pdev->dev); 1743 pm_runtime_disable(&pdev->dev);
1747 1744
1748 snd_soc_unregister_dais(&pdev->dev, ARRAY_SIZE(fsi_soc_dai)); 1745 snd_soc_unregister_dais(&pdev->dev, ARRAY_SIZE(fsi_soc_dai));