Commit b7b8f9bf authored by Janusz Krzysztofik's avatar Janusz Krzysztofik Committed by Mark Brown
Browse files

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: default avatarJanusz Krzysztofik <jkrzyszt@tis.icnet.pl>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 06cddefc

include/linux/tty.h

+1 −1
Original line number Diff line number Diff line
@@ -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

sound/soc/omap/ams-delta.c

+3 −3
Original line number Diff line number Diff line
@@ -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),