Commit 95b14fb2 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

V4L/DVB (10953): cx25840: Fix CodingStyle errors introduced by the last patch 



Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 149783b5

drivers/media/video/cx25840/cx25840-audio.c

+18 −24
Original line number Diff line number Diff line
@@ -45,7 +45,6 @@ static int set_audclk_freq(struct i2c_client *client, u32 freq) 
			}



			if (!state->is_cx231xx) {



				/* VID_PLL and AUX_PLL */

				cx25840_write4(client, 0x108, 0x1006040f);
@@ -70,7 +69,6 @@ static int set_audclk_freq(struct i2c_client *client, u32 freq) 
			}



			if (!state->is_cx231xx) {



				/* VID_PLL and AUX_PLL */

				cx25840_write4(client, 0x108, 0x1009040f);
@@ -95,7 +93,6 @@ static int set_audclk_freq(struct i2c_client *client, u32 freq) 
			}



			if (!state->is_cx231xx) {



				/* VID_PLL and AUX_PLL */

				cx25840_write4(client, 0x108, 0x100a040f);
@@ -122,7 +119,6 @@ static int set_audclk_freq(struct i2c_client *client, u32 freq) 
			}



			if (!state->is_cx231xx) {



				/* VID_PLL and AUX_PLL */

				cx25840_write4(client, 0x108, 0x1e08040f);
@@ -154,7 +150,6 @@ static int set_audclk_freq(struct i2c_client *client, u32 freq) 




			if (!state->is_cx231xx) {



				/* VID_PLL and AUX_PLL */

				cx25840_write4(client, 0x108, 0x1809040f);
@@ -247,11 +242,10 @@ void cx25840_audio_set_path(struct i2c_client *client) 
	/* deassert soft reset */

	cx25840_and_or(client, 0x810, ~0x1, 0x00);



	if (state->is_cx23885 || state->is_cx231xx) {

	/* Ensure the controller is running when we exit */

	if (state->is_cx23885 || state->is_cx231xx)

		cx25840_and_or(client, 0x803, ~0x10, 0x10);

}

}



static int get_volume(struct i2c_client *client)

{

drivers/media/video/cx25840/cx25840-core.c

+38 −42
Original line number Diff line number Diff line
@@ -374,15 +374,12 @@ static void cx231xx_initialize(struct i2c_client *client) 
	/* DIF Src phase inc */

	cx25840_write4(client, 0x340, 0x0df7df83);





	/* Luma */

	cx25840_write4(client, 0x414, 0x00107d12);



	/* Chroma */

	cx25840_write4(client, 0x420, 0x3d008282);







	/* ADC2 input select */

	cx25840_write(client, 0x102, 0x10);
@@ -395,7 +392,6 @@ static void cx231xx_initialize(struct i2c_client *client) 
	/* White crush, Chroma AGC & Chroma Killer enabled */

	cx25840_write(client, 0x401, 0xe8);





	/* Do the firmware load in a work handler to prevent.

	   Otherwise the kernel is blocked waiting for the

	   bit-banging i2c interface to finish uploading the
@@ -1567,7 +1563,7 @@ static int cx25840_probe(struct i2c_client *client, 
	state->c = client;

	state->is_cx25836 = ((device_id & 0xff00) == 0x8300);

	state->is_cx23885 = (device_id == 0x0000) || (device_id == 0x1313);

    state->is_cx231xx = (device_id == 0x5A3E);

	state->is_cx231xx = (device_id == 0x5a3e);

	state->vid_input = CX25840_COMPOSITE7;

	state->aud_input = CX25840_AUDIO8;

	state->audclk_freq = 48000;

drivers/media/video/cx25840/cx25840-firmware.c

+7 −7
Original line number Diff line number Diff line
@@ -105,7 +105,7 @@ int cx25840_loadfw(struct i2c_client *client) 
		firmware = FWFILE_CX231XX;



	if ((state->is_cx231xx) && MAX_BUF_SIZE > 16) {

	 printk(" Firmware download size changed to 16 bytes max length\n");

		v4l_err(client, " Firmware download size changed to 16 bytes max length\n");

		MAX_BUF_SIZE = 16;  /* cx231xx cannot accept more than 16 bytes at a time */

	}