Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7b3c6d65 authored by Nickolay's avatar Nickolay Committed by Linus Torvalds
Browse files

[PATCH] v4l: 706: reindent cx88 tvaudio c to keep coding style 



- Reindent cx88-tvaudio.c to keep coding style.

Signed-off-by: default avatarNickolay V. Shmyrev <nshmyrev@yandex.ru>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@brturbo.com.br>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 0bcc37c3

drivers/media/video/cx88/cx88-tvaudio.c

+484 −479
Original line number Diff line number Diff line
@@ -65,8 +65,7 @@ MODULE_PARM_DESC(audio_debug,"enable debug messages [audio]"); 


/* ----------------------------------------------------------- */



static char *aud_ctl_names[64] =

{

static char *aud_ctl_names[64] = {

	[EN_BTSC_FORCE_MONO] = "BTSC_FORCE_MONO",

	[EN_BTSC_FORCE_STEREO] = "BTSC_FORCE_STEREO",

	[EN_BTSC_FORCE_SAP] = "BTSC_FORCE_SAP",
@@ -97,8 +96,7 @@ struct rlist { 
	u32 val;

};



static void set_audio_registers(struct cx88_core *core,

				const struct rlist *l)

static void set_audio_registers(struct cx88_core *core, const struct rlist *l)

{

	int i;
@@ -119,8 +117,7 @@ static void set_audio_registers(struct cx88_core *core, 
	}

}



static void set_audio_start(struct cx88_core *core,

			u32 mode)

static void set_audio_start(struct cx88_core *core, u32 mode)

{

	// mute

	cx_write(AUD_VOL_CTL, (1 << 6));
@@ -162,7 +159,8 @@ static void set_audio_finish(struct cx88_core *core, u32 ctl) 


/* ----------------------------------------------------------- */



static void set_audio_standard_BTSC(struct cx88_core *core, unsigned int sap, u32 mode)

static void set_audio_standard_BTSC(struct cx88_core *core, unsigned int sap,

				    u32 mode)

{

	static const struct rlist btsc[] = {

		{AUD_AFE_12DB_EN, 0x00000001},
@@ -638,7 +636,8 @@ static void set_audio_standard_EIAJ(struct cx88_core *core) 
	set_audio_finish(core, EN_EIAJ_AUTO_STEREO);

}



static void set_audio_standard_FM(struct cx88_core *core, enum cx88_deemph_type deemph)

static void set_audio_standard_FM(struct cx88_core *core,

				  enum cx88_deemph_type deemph)

{

	static const struct rlist fm_deemph_50[] = {

		{AUD_DEEMPH0_G0, 0x0C45},
@@ -683,8 +682,7 @@ static void set_audio_standard_FM(struct cx88_core *core, enum cx88_deemph_type 
	dprintk("%s (status: unknown)\n", __FUNCTION__);

	set_audio_start(core, SEL_FMRADIO);



	switch (deemph)

	{

	switch (deemph) {

	case FM_NO_DEEMPH:

		set_audio_registers(core, fm_no_deemph);

		break;
@@ -801,8 +799,7 @@ void cx88_get_stereo(struct cx88_core *core, struct v4l2_tuner *t) 


	switch (core->tvaudio) {

	case WW_BTSC:

		t->capability = V4L2_TUNER_CAP_STEREO |

			V4L2_TUNER_CAP_SAP;

		t->capability = V4L2_TUNER_CAP_STEREO | V4L2_TUNER_CAP_SAP;

		t->rxsubchans = V4L2_TUNER_SUB_STEREO;

		if (1 == pilot) {

			/* SAP */
@@ -814,13 +811,15 @@ void cx88_get_stereo(struct cx88_core *core, struct v4l2_tuner *t) 
	case WW_A2_M:

		if (1 == pilot) {

			/* stereo */

			t->rxsubchans = V4L2_TUNER_SUB_MONO | V4L2_TUNER_SUB_STEREO;

			t->rxsubchans =

			    V4L2_TUNER_SUB_MONO | V4L2_TUNER_SUB_STEREO;

			if (0 == mode)

				t->audmode = V4L2_TUNER_MODE_STEREO;

		}

		if (2 == pilot) {

			/* dual language -- FIXME */

			t->rxsubchans = V4L2_TUNER_SUB_LANG1 | V4L2_TUNER_SUB_LANG2;

			t->rxsubchans =

			    V4L2_TUNER_SUB_LANG1 | V4L2_TUNER_SUB_LANG2;

			t->audmode = V4L2_TUNER_MODE_LANG1;

		}

		break;
@@ -882,13 +881,16 @@ void cx88_set_stereo(struct cx88_core *core, u32 mode, int manual) 
			switch (mode) {

			case V4L2_TUNER_MODE_MONO:

			case V4L2_TUNER_MODE_LANG1:

						set_audio_standard_NICAM(core, EN_NICAM_FORCE_MONO1);

				set_audio_standard_NICAM(core,

							 EN_NICAM_FORCE_MONO1);

				break;

			case V4L2_TUNER_MODE_LANG2:

						set_audio_standard_NICAM(core, EN_NICAM_FORCE_MONO2);

				set_audio_standard_NICAM(core,

							 EN_NICAM_FORCE_MONO2);

				break;

			case V4L2_TUNER_MODE_STEREO:

						set_audio_standard_NICAM(core, EN_NICAM_FORCE_STEREO);

				set_audio_standard_NICAM(core,

							 EN_NICAM_FORCE_STEREO);

				break;

			}

		} else {
@@ -900,13 +902,16 @@ void cx88_set_stereo(struct cx88_core *core, u32 mode, int manual) 
				switch (mode) {

				case V4L2_TUNER_MODE_MONO:

				case V4L2_TUNER_MODE_LANG1:

					set_audio_standard_A2(core, EN_A2_FORCE_MONO1);

					set_audio_standard_A2(core,

							      EN_A2_FORCE_MONO1);

					break;

				case V4L2_TUNER_MODE_LANG2:

					set_audio_standard_A2(core, EN_A2_FORCE_MONO2);

					set_audio_standard_A2(core,

							      EN_A2_FORCE_MONO2);

					break;

				case V4L2_TUNER_MODE_STEREO:

					set_audio_standard_A2(core, EN_A2_FORCE_STEREO);

					set_audio_standard_A2(core,

							      EN_A2_FORCE_STEREO);

					break;

				}

			}