lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Mauro Carvalho Chehab
2009-03-03 14:36:55 -03:00
parent 149783b581
commit 95b14fb23b
3 changed files with 61 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/media/video/cx25840/cx25840-audio.c
View File

@@ -45,7 +45,6 @@ static int set_audclk_freq(struct i2c_client *client, u32 freq)
} }
if (!state->is_cx231xx) { if (!state->is_cx231xx) {
/* VID_PLL and AUX_PLL */ /* VID_PLL and AUX_PLL */
cx25840_write4(client, 0x108, 0x1006040f); cx25840_write4(client, 0x108, 0x1006040f);
@@ -70,7 +69,6 @@ static int set_audclk_freq(struct i2c_client *client, u32 freq)
} }
if (!state->is_cx231xx) { if (!state->is_cx231xx) {
/* VID_PLL and AUX_PLL */ /* VID_PLL and AUX_PLL */
cx25840_write4(client, 0x108, 0x1009040f); cx25840_write4(client, 0x108, 0x1009040f);
@@ -95,7 +93,6 @@ static int set_audclk_freq(struct i2c_client *client, u32 freq)
} }
if (!state->is_cx231xx) { if (!state->is_cx231xx) {
/* VID_PLL and AUX_PLL */ /* VID_PLL and AUX_PLL */
cx25840_write4(client, 0x108, 0x100a040f); cx25840_write4(client, 0x108, 0x100a040f);
@@ -122,7 +119,6 @@ static int set_audclk_freq(struct i2c_client *client, u32 freq)
} }
if (!state->is_cx231xx) { if (!state->is_cx231xx) {
/* VID_PLL and AUX_PLL */ /* VID_PLL and AUX_PLL */
cx25840_write4(client, 0x108, 0x1e08040f); cx25840_write4(client, 0x108, 0x1e08040f);
@@ -154,7 +150,6 @@ static int set_audclk_freq(struct i2c_client *client, u32 freq)
if (!state->is_cx231xx) { if (!state->is_cx231xx) {
/* VID_PLL and AUX_PLL */ /* VID_PLL and AUX_PLL */
cx25840_write4(client, 0x108, 0x1809040f); cx25840_write4(client, 0x108, 0x1809040f);
@@ -247,10 +242,9 @@ void cx25840_audio_set_path(struct i2c_client *client)
/* deassert soft reset */ /* deassert soft reset */
cx25840_and_or(client, 0x810, ~0x1, 0x00); cx25840_and_or(client, 0x810, ~0x1, 0x00);
if (state->is_cx23885 || state->is_cx231xx) {
/* Ensure the controller is running when we exit */ /* Ensure the controller is running when we exit */
if (state->is_cx23885 || state->is_cx231xx)
cx25840_and_or(client, 0x803, ~0x10, 0x10); cx25840_and_or(client, 0x803, ~0x10, 0x10);
}
} }
static int get_volume(struct i2c_client *client) static int get_volume(struct i2c_client *client)

6
drivers/media/video/cx25840/cx25840-core.c
View File

@@ -374,15 +374,12 @@ static void cx231xx_initialize(struct i2c_client *client)
/* DIF Src phase inc */ /* DIF Src phase inc */
cx25840_write4(client, 0x340, 0x0df7df83); cx25840_write4(client, 0x340, 0x0df7df83);
/* Luma */ /* Luma */
cx25840_write4(client, 0x414, 0x00107d12); cx25840_write4(client, 0x414, 0x00107d12);
/* Chroma */ /* Chroma */
cx25840_write4(client, 0x420, 0x3d008282); cx25840_write4(client, 0x420, 0x3d008282);
/* ADC2 input select */ /* ADC2 input select */
cx25840_write(client, 0x102, 0x10); cx25840_write(client, 0x102, 0x10);
@@ -395,7 +392,6 @@ static void cx231xx_initialize(struct i2c_client *client)
/* White crush, Chroma AGC & Chroma Killer enabled */ /* White crush, Chroma AGC & Chroma Killer enabled */
cx25840_write(client, 0x401, 0xe8); cx25840_write(client, 0x401, 0xe8);
/* Do the firmware load in a work handler to prevent. /* Do the firmware load in a work handler to prevent.
Otherwise the kernel is blocked waiting for the Otherwise the kernel is blocked waiting for the
bit-banging i2c interface to finish uploading 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->c = client;
state->is_cx25836 = ((device_id & 0xff00) == 0x8300); state->is_cx25836 = ((device_id & 0xff00) == 0x8300);
state->is_cx23885 = (device_id == 0x0000) || (device_id == 0x1313); 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->vid_input = CX25840_COMPOSITE7;
state->aud_input = CX25840_AUDIO8; state->aud_input = CX25840_AUDIO8;
state->audclk_freq = 48000; state->audclk_freq = 48000;

6
drivers/media/video/cx25840/cx25840-firmware.c
View File

@@ -101,11 +101,11 @@ int cx25840_loadfw(struct i2c_client *client)
if (state->is_cx23885) if (state->is_cx23885)
firmware = FWFILE_CX23885; firmware = FWFILE_CX23885;
else if ( state->is_cx231xx) else if (state->is_cx231xx)
firmware = FWFILE_CX231XX; firmware = FWFILE_CX231XX;
if( (state->is_cx231xx) && MAX_BUF_SIZE > 16) { 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 */ MAX_BUF_SIZE = 16; /* cx231xx cannot accept more than 16 bytes at a time */
} }