]> git.karo-electronics.de Git - linux-beck.git/commitdiff
ASoC: twl6040: Remove strings "NULL" from DAPM route
authorPeter Ujfalusi <peter.ujfalusi@ti.com>
Thu, 22 Sep 2011 08:05:47 +0000 (11:05 +0300)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Thu, 22 Sep 2011 16:20:21 +0000 (17:20 +0100)
Replace the string with plain NULL.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Acked-by: Liam Girdwood <lrg@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
sound/soc/codecs/twl6040.c

index 6f6b1806337fea788c2a8120a7e16b77e5defe15..9fbfe0ee90ff43c2b764f92bf2a5a30bab4020d1 100644 (file)
@@ -1199,8 +1199,8 @@ static const struct snd_soc_dapm_route intercon[] = {
        {"ADC Right", NULL, "MicAmpR"},
 
        /* AFM path */
-       {"AFMAmpL", "NULL", "AFML"},
-       {"AFMAmpR", "NULL", "AFMR"},
+       {"AFMAmpL", NULL, "AFML"},
+       {"AFMAmpR", NULL, "AFMR"},
 
        {"HS Left Playback", "HS DAC", "HSDAC Left"},
        {"HS Left Playback", "Line-In amp", "AFMAmpL"},
@@ -1208,8 +1208,8 @@ static const struct snd_soc_dapm_route intercon[] = {
        {"HS Right Playback", "HS DAC", "HSDAC Right"},
        {"HS Right Playback", "Line-In amp", "AFMAmpR"},
 
-       {"Headset Left Driver", "NULL", "HS Left Playback"},
-       {"Headset Right Driver", "NULL", "HS Right Playback"},
+       {"Headset Left Driver", NULL, "HS Left Playback"},
+       {"Headset Right Driver", NULL, "HS Right Playback"},
 
        {"HSOL", NULL, "Headset Left Driver"},
        {"HSOR", NULL, "Headset Right Driver"},