ASoC: madera: Don't clean up bus error IRQ in codec_remove

The bus error IRQ is requested in bus probe and so should be cleaned up
in bus remove. There is already a call to do this in bus remove so just
remove the duplicated free in codec_remove.

Change-Id: If867d75b672d8dd55db42f93b7c1f4d5cae19606
Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com>

diff --git a/sound/soc/codecs/cs47l90.c b/sound/soc/codecs/cs47l90.c
index 23a5bd800e04faf86772d5bb2228edfb8393943a..45cc167dc950abfa8edd904d5aba97f40a3ad407 100644 (file)
--- a/sound/soc/codecs/cs47l90.c
+++ b/sound/soc/codecs/cs47l90.c
@@ -2506,10 +2506,8 @@ static int cs47l90_codec_remove(struct snd_soc_codec *codec)
        int i;
        struct cs47l90 *cs47l90 = snd_soc_codec_get_drvdata(codec);
 
-       for (i = 0; i < CS47L90_NUM_ADSP; i++) {
+       for (i = 0; i < CS47L90_NUM_ADSP; i++)
                wm_adsp2_codec_remove(&cs47l90->core.adsp[i], codec);
-               madera_destroy_bus_error_irq(&cs47l90->core, i);
-       }
 
        cs47l90->core.madera->dapm = NULL;
 

diff --git a/sound/soc/codecs/cs47l92.c b/sound/soc/codecs/cs47l92.c
index 78b1859ca6a3af40512a194bfc92f60d58ad2759..ea11c3ac979a4ced07112501fd77eeb34a2ff4b0 100644 (file)
--- a/sound/soc/codecs/cs47l92.c
+++ b/sound/soc/codecs/cs47l92.c
@@ -1967,7 +1967,6 @@ static int cs47l92_codec_remove(struct snd_soc_codec *codec)
        struct cs47l92 *cs47l92 = snd_soc_codec_get_drvdata(codec);
 
        wm_adsp2_codec_remove(&cs47l92->core.adsp[0], codec);
-       madera_destroy_bus_error_irq(&cs47l92->core, 0);
 
        cs47l92->core.madera->dapm = NULL;