TTY/ASoC: Rename N_AMSDELTA line discipline to N_V253

The patch changes the line discipline name registered in include/linux/tty.h
and updates the ams-delta machine driver to use it.

Signed-off-by: Janusz Krzysztofik <jkrzyszt@tis.icnet.pl>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

diff --git a/include/linux/tty.h b/include/linux/tty.h
index 26af9816391f3f2112223ce11de5b649e4b297c6..15bd3b065a9d76adba4d7b5a2b714b68ba673092 100644 (file)
--- a/include/linux/tty.h
+++ b/include/linux/tty.h
@@ -47,7 +47,7 @@
 #define N_SLCAN                17      /* Serial / USB serial CAN Adaptors */
 #define N_PPS          18      /* Pulse per Second */
 
-#define N_AMSDELTA     19      /* codec control over modem, board specific */
+#define N_V253         19      /* Codec control over voice modem */
 
 /*
  * This character is the same as _POSIX_VDISABLE: it cannot be used as

diff --git a/sound/soc/omap/ams-delta.c b/sound/soc/omap/ams-delta.c
index 4f35b1f18cb91a64481d50ea42c7b2549462887a..5a5166ac727940105870bc6cd8d6c7f8f965ebb7 100644 (file)
--- a/sound/soc/omap/ams-delta.c
+++ b/sound/soc/omap/ams-delta.c
@@ -500,7 +500,7 @@ static int ams_delta_cx20442_init(struct snd_soc_codec *codec)
        }
 
        /* Register optional line discipline for over the modem control */
-       ret = tty_register_ldisc(N_AMSDELTA, &cx81801_ops);
+       ret = tty_register_ldisc(N_V253, &cx81801_ops);
        if (ret) {
                dev_warn(card->dev,
                                "Failed to register line discipline, "
@@ -625,9 +625,9 @@ static void __exit ams_delta_module_exit(void)
                }
        }
 
-       if (tty_unregister_ldisc(N_AMSDELTA) != 0)
+       if (tty_unregister_ldisc(N_V253) != 0)
                dev_warn(&ams_delta_audio_platform_device->dev,
-                       "failed to unregister AMSDELTA line discipline\n");
+                       "failed to unregister V253 line discipline\n");
 
        snd_soc_jack_free_gpios(&ams_delta_hook_switch,
                        ARRAY_SIZE(ams_delta_hook_switch_gpios),