ASoC: rsnd: don't use devm_request_irq() for SSI

SSI will use DMA mode, and migh be fallback to PIO mode.
Using devm_request_irq() makes its operation more complex when
it fallbacks to PIO mode.
Let's use manual request_irq()/free_irq()

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/sh/rcar/ssi.c b/sound/soc/sh/rcar/ssi.c
index 59cd9824d8a4e9e36e7b1ec7a35afa5c1f0c604b..b0338d0a4cde211504d12f6924cc3b541d041846 100644 (file)
--- a/sound/soc/sh/rcar/ssi.c
+++ b/sound/soc/sh/rcar/ssi.c
@@ -644,10 +644,14 @@ static int rsnd_ssi_common_probe(struct rsnd_mod *mod,
        if (ret < 0)
                return ret;
 
-       ret = devm_request_irq(dev, ssi->irq,
-                              rsnd_ssi_interrupt,
-                              IRQF_SHARED,
-                              dev_name(dev), mod);
+       /*
+        * SSI might be called again as PIO fallback
+        * It is easy to manual handling for IRQ request/free
+        */
+       ret = request_irq(ssi->irq,
+                         rsnd_ssi_interrupt,
+                         IRQF_SHARED,
+                         dev_name(dev), mod);
 
        return ret;
 }
@@ -693,12 +697,9 @@ static int rsnd_ssi_dma_remove(struct rsnd_mod *mod,
                               struct rsnd_priv *priv)
 {
        struct rsnd_ssi *ssi = rsnd_mod_to_ssi(mod);
-       struct device *dev = rsnd_priv_to_dev(priv);
-       int irq = ssi->irq;
 
        /* PIO will request IRQ again */
-       if (ssi->dma)
-               devm_free_irq(dev, irq, mod);
+       free_irq(ssi->irq, mod);
 
        rsnd_dma_detach(mod, &ssi->dma);