diff options
author | Trent Piepho <xyzzy@speakeasy.org> | 2006-06-19 23:30:57 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-06-25 01:05:10 -0400 |
commit | 657de3cd32285831a56f9f96deb85c64205c42fc (patch) | |
tree | 3caea8235cc28ef10affe81277724e5a1adcf02e /drivers/media/video/saa7134 | |
parent | f49ba8d7cd252eac19004e2ebe18dfffe548c2c3 (diff) |
V4L/DVB (4118): Whitespace cleanups
Signed-off-by: Trent Piepho <xyzzy@speakeasy.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video/saa7134')
-rw-r--r-- | drivers/media/video/saa7134/saa6752hs.c | 26 | ||||
-rw-r--r-- | drivers/media/video/saa7134/saa7134-alsa.c | 2 | ||||
-rw-r--r-- | drivers/media/video/saa7134/saa7134-cards.c | 2 |
3 files changed, 15 insertions, 15 deletions
diff --git a/drivers/media/video/saa7134/saa6752hs.c b/drivers/media/video/saa7134/saa6752hs.c index 0e0ba50946e8..a95878004f93 100644 --- a/drivers/media/video/saa7134/saa6752hs.c +++ b/drivers/media/video/saa7134/saa6752hs.c | |||
@@ -62,11 +62,11 @@ struct saa6752hs_state { | |||
62 | 62 | ||
63 | enum saa6752hs_command { | 63 | enum saa6752hs_command { |
64 | SAA6752HS_COMMAND_RESET = 0, | 64 | SAA6752HS_COMMAND_RESET = 0, |
65 | SAA6752HS_COMMAND_STOP = 1, | 65 | SAA6752HS_COMMAND_STOP = 1, |
66 | SAA6752HS_COMMAND_START = 2, | 66 | SAA6752HS_COMMAND_START = 2, |
67 | SAA6752HS_COMMAND_PAUSE = 3, | 67 | SAA6752HS_COMMAND_PAUSE = 3, |
68 | SAA6752HS_COMMAND_RECONFIGURE = 4, | 68 | SAA6752HS_COMMAND_RECONFIGURE = 4, |
69 | SAA6752HS_COMMAND_SLEEP = 5, | 69 | SAA6752HS_COMMAND_SLEEP = 5, |
70 | SAA6752HS_COMMAND_RECONFIGURE_FORCE = 6, | 70 | SAA6752HS_COMMAND_RECONFIGURE_FORCE = 6, |
71 | 71 | ||
72 | SAA6752HS_COMMAND_MAX | 72 | SAA6752HS_COMMAND_MAX |
@@ -241,19 +241,19 @@ static int saa6752hs_set_bitrate(struct i2c_client* client, | |||
241 | if (params->vi_bitrate.mode == V4L2_BITRATE_VBR) { | 241 | if (params->vi_bitrate.mode == V4L2_BITRATE_VBR) { |
242 | /* set the target bitrate */ | 242 | /* set the target bitrate */ |
243 | buf[0] = 0x80; | 243 | buf[0] = 0x80; |
244 | buf[1] = params->vi_bitrate.target >> 8; | 244 | buf[1] = params->vi_bitrate.target >> 8; |
245 | buf[2] = params->vi_bitrate.target & 0xff; | 245 | buf[2] = params->vi_bitrate.target & 0xff; |
246 | i2c_master_send(client, buf, 3); | 246 | i2c_master_send(client, buf, 3); |
247 | 247 | ||
248 | /* set the max bitrate */ | 248 | /* set the max bitrate */ |
249 | buf[0] = 0x81; | 249 | buf[0] = 0x81; |
250 | buf[1] = params->vi_bitrate.max >> 8; | 250 | buf[1] = params->vi_bitrate.max >> 8; |
251 | buf[2] = params->vi_bitrate.max & 0xff; | 251 | buf[2] = params->vi_bitrate.max & 0xff; |
252 | i2c_master_send(client, buf, 3); | 252 | i2c_master_send(client, buf, 3); |
253 | } else { | 253 | } else { |
254 | /* set the target bitrate (no max bitrate for CBR) */ | 254 | /* set the target bitrate (no max bitrate for CBR) */ |
255 | buf[0] = 0x81; | 255 | buf[0] = 0x81; |
256 | buf[1] = params->vi_bitrate.target >> 8; | 256 | buf[1] = params->vi_bitrate.target >> 8; |
257 | buf[2] = params->vi_bitrate.target & 0xff; | 257 | buf[2] = params->vi_bitrate.target & 0xff; |
258 | i2c_master_send(client, buf, 3); | 258 | i2c_master_send(client, buf, 3); |
259 | } | 259 | } |
@@ -395,22 +395,22 @@ static int saa6752hs_init(struct i2c_client* client) | |||
395 | buf[2] = 0x0D; | 395 | buf[2] = 0x0D; |
396 | i2c_master_send(client,buf,3); | 396 | i2c_master_send(client,buf,3); |
397 | 397 | ||
398 | /* Set minimum Q-scale {4} */ | 398 | /* Set minimum Q-scale {4} */ |
399 | buf[0] = 0x82; | 399 | buf[0] = 0x82; |
400 | buf[1] = 0x04; | 400 | buf[1] = 0x04; |
401 | i2c_master_send(client,buf,2); | 401 | i2c_master_send(client,buf,2); |
402 | 402 | ||
403 | /* Set maximum Q-scale {12} */ | 403 | /* Set maximum Q-scale {12} */ |
404 | buf[0] = 0x83; | 404 | buf[0] = 0x83; |
405 | buf[1] = 0x0C; | 405 | buf[1] = 0x0C; |
406 | i2c_master_send(client,buf,2); | 406 | i2c_master_send(client,buf,2); |
407 | 407 | ||
408 | /* Set Output Protocol */ | 408 | /* Set Output Protocol */ |
409 | buf[0] = 0xD0; | 409 | buf[0] = 0xD0; |
410 | buf[1] = 0x81; | 410 | buf[1] = 0x81; |
411 | i2c_master_send(client,buf,2); | 411 | i2c_master_send(client,buf,2); |
412 | 412 | ||
413 | /* Set video output stream format {TS} */ | 413 | /* Set video output stream format {TS} */ |
414 | buf[0] = 0xB0; | 414 | buf[0] = 0xB0; |
415 | buf[1] = 0x05; | 415 | buf[1] = 0x05; |
416 | i2c_master_send(client,buf,2); | 416 | i2c_master_send(client,buf,2); |
@@ -441,7 +441,7 @@ static int saa6752hs_init(struct i2c_client* client) | |||
441 | localPMT[sizeof(PMT) - 2] = (crc >> 8) & 0xFF; | 441 | localPMT[sizeof(PMT) - 2] = (crc >> 8) & 0xFF; |
442 | localPMT[sizeof(PMT) - 1] = crc & 0xFF; | 442 | localPMT[sizeof(PMT) - 1] = crc & 0xFF; |
443 | 443 | ||
444 | /* Set Audio PID */ | 444 | /* Set Audio PID */ |
445 | buf[0] = 0xC1; | 445 | buf[0] = 0xC1; |
446 | buf[1] = (h->params.ts_pid_audio >> 8) & 0xFF; | 446 | buf[1] = (h->params.ts_pid_audio >> 8) & 0xFF; |
447 | buf[2] = h->params.ts_pid_audio & 0xFF; | 447 | buf[2] = h->params.ts_pid_audio & 0xFF; |
diff --git a/drivers/media/video/saa7134/saa7134-alsa.c b/drivers/media/video/saa7134/saa7134-alsa.c index bb3e0ba946d3..d77e6a8d9432 100644 --- a/drivers/media/video/saa7134/saa7134-alsa.c +++ b/drivers/media/video/saa7134/saa7134-alsa.c | |||
@@ -818,7 +818,7 @@ static int snd_saa7134_capsrc_put(struct snd_kcontrol * kcontrol, | |||
818 | break; | 818 | break; |
819 | } | 819 | } |
820 | 820 | ||
821 | /* output xbar always main channel */ | 821 | /* output xbar always main channel */ |
822 | saa_dsp_writel(dev, SAA7133_DIGITAL_OUTPUT_SEL1, 0xbbbb10); | 822 | saa_dsp_writel(dev, SAA7133_DIGITAL_OUTPUT_SEL1, 0xbbbb10); |
823 | 823 | ||
824 | if (left || right) { // We've got data, turn the input on | 824 | if (left || right) { // We've got data, turn the input on |
diff --git a/drivers/media/video/saa7134/saa7134-cards.c b/drivers/media/video/saa7134/saa7134-cards.c index e638b198786e..927413aded10 100644 --- a/drivers/media/video/saa7134/saa7134-cards.c +++ b/drivers/media/video/saa7134/saa7134-cards.c | |||
@@ -2160,7 +2160,7 @@ struct saa7134_board saa7134_boards[] = { | |||
2160 | .radio = { | 2160 | .radio = { |
2161 | .name = name_radio, | 2161 | .name = name_radio, |
2162 | .amux = LINE2, | 2162 | .amux = LINE2, |
2163 | }, | 2163 | }, |
2164 | }, | 2164 | }, |
2165 | [SAA7134_BOARD_GOTVIEW_7135] = { | 2165 | [SAA7134_BOARD_GOTVIEW_7135] = { |
2166 | /* Mike Baikov <mike@baikov.com> */ | 2166 | /* Mike Baikov <mike@baikov.com> */ |