diff options
author | Mauro Carvalho Chehab <mchehab@brturbo.com.br> | 2005-11-09 00:37:45 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-09 10:56:21 -0500 |
commit | f2421ca3383ed35bc634aa29416a3229dc603fa4 (patch) | |
tree | 60fccd8a1542ebfe36761d01d2b1994c0c378485 /drivers/media/video | |
parent | 4ac97914c6c35f6bf132071c718e034d0846b9f5 (diff) |
[PATCH] v4l: 801: whitespaces cleanups
- Whitespaces Cleanups.
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/media/video')
-rw-r--r-- | drivers/media/video/bttv-cards.c | 4 | ||||
-rw-r--r-- | drivers/media/video/bttv-risc.c | 4 | ||||
-rw-r--r-- | drivers/media/video/cx88/cx88-core.c | 4 | ||||
-rw-r--r-- | drivers/media/video/cx88/cx88-dvb.c | 2 | ||||
-rw-r--r-- | drivers/media/video/saa7134/saa7134-alsa.c | 12 | ||||
-rw-r--r-- | drivers/media/video/saa7134/saa7134-dvb.c | 4 | ||||
-rw-r--r-- | drivers/media/video/saa7134/saa7134-input.c | 2 | ||||
-rw-r--r-- | drivers/media/video/saa7134/saa7134-video.c | 4 | ||||
-rw-r--r-- | drivers/media/video/tvaudio.c | 8 | ||||
-rw-r--r-- | drivers/media/video/tveeprom.c | 2 |
10 files changed, 23 insertions, 23 deletions
diff --git a/drivers/media/video/bttv-cards.c b/drivers/media/video/bttv-cards.c index 92bb515fbe4d..695a67e9edd7 100644 --- a/drivers/media/video/bttv-cards.c +++ b/drivers/media/video/bttv-cards.c | |||
@@ -3585,7 +3585,7 @@ static void __devinit osprey_eeprom(struct bttv *btv) | |||
3585 | for(i = 0; i<14; i++) checksum += ee[i+offset]; | 3585 | for(i = 0; i<14; i++) checksum += ee[i+offset]; |
3586 | checksum = ~checksum; /* no idea why */ | 3586 | checksum = ~checksum; /* no idea why */ |
3587 | if ((((checksum>>8)&0x0FF) == ee[offset+14]) && | 3587 | if ((((checksum>>8)&0x0FF) == ee[offset+14]) && |
3588 | ((checksum & 0x0FF) == ee[offset+15])) { | 3588 | ((checksum & 0x0FF) == ee[offset+15])) { |
3589 | break; | 3589 | break; |
3590 | } | 3590 | } |
3591 | } | 3591 | } |
@@ -4420,7 +4420,7 @@ windvr_audio(struct bttv *btv, struct video_audio *v, int set) | |||
4420 | if (val) { | 4420 | if (val) { |
4421 | gpio_bits(0x140000, val); | 4421 | gpio_bits(0x140000, val); |
4422 | if (bttv_gpio) | 4422 | if (bttv_gpio) |
4423 | bttv_gpio_tracking(btv,"windvr"); | 4423 | bttv_gpio_tracking(btv,"windvr"); |
4424 | } | 4424 | } |
4425 | } else { | 4425 | } else { |
4426 | v->mode = VIDEO_SOUND_MONO | VIDEO_SOUND_STEREO | | 4426 | v->mode = VIDEO_SOUND_MONO | VIDEO_SOUND_STEREO | |
diff --git a/drivers/media/video/bttv-risc.c b/drivers/media/video/bttv-risc.c index 3028862934dd..b40e9734bf08 100644 --- a/drivers/media/video/bttv-risc.c +++ b/drivers/media/video/bttv-risc.c | |||
@@ -88,9 +88,9 @@ bttv_risc_packed(struct bttv *btv, struct btcx_riscmem *risc, | |||
88 | offset = 0; | 88 | offset = 0; |
89 | sg++; | 89 | sg++; |
90 | while (todo > sg_dma_len(sg)) { | 90 | while (todo > sg_dma_len(sg)) { |
91 | *(rp++)=cpu_to_le32(BT848_RISC_WRITE| | 91 | *(rp++)=cpu_to_le32(BT848_RISC_WRITE| |
92 | sg_dma_len(sg)); | 92 | sg_dma_len(sg)); |
93 | *(rp++)=cpu_to_le32(sg_dma_address(sg)); | 93 | *(rp++)=cpu_to_le32(sg_dma_address(sg)); |
94 | todo -= sg_dma_len(sg); | 94 | todo -= sg_dma_len(sg); |
95 | sg++; | 95 | sg++; |
96 | } | 96 | } |
diff --git a/drivers/media/video/cx88/cx88-core.c b/drivers/media/video/cx88/cx88-core.c index f01a631d0c00..eb806af17182 100644 --- a/drivers/media/video/cx88/cx88-core.c +++ b/drivers/media/video/cx88/cx88-core.c | |||
@@ -166,9 +166,9 @@ static u32* cx88_risc_field(u32 *rp, struct scatterlist *sglist, | |||
166 | offset = 0; | 166 | offset = 0; |
167 | sg++; | 167 | sg++; |
168 | while (todo > sg_dma_len(sg)) { | 168 | while (todo > sg_dma_len(sg)) { |
169 | *(rp++)=cpu_to_le32(RISC_WRITE| | 169 | *(rp++)=cpu_to_le32(RISC_WRITE| |
170 | sg_dma_len(sg)); | 170 | sg_dma_len(sg)); |
171 | *(rp++)=cpu_to_le32(sg_dma_address(sg)); | 171 | *(rp++)=cpu_to_le32(sg_dma_address(sg)); |
172 | todo -= sg_dma_len(sg); | 172 | todo -= sg_dma_len(sg); |
173 | sg++; | 173 | sg++; |
174 | } | 174 | } |
diff --git a/drivers/media/video/cx88/cx88-dvb.c b/drivers/media/video/cx88/cx88-dvb.c index 3be601cfc99b..a7a077196fc9 100644 --- a/drivers/media/video/cx88/cx88-dvb.c +++ b/drivers/media/video/cx88/cx88-dvb.c | |||
@@ -128,7 +128,7 @@ static int dntv_live_dvbt_demod_init(struct dvb_frontend* fe) | |||
128 | static u8 reset [] = { 0x50, 0x80 }; | 128 | static u8 reset [] = { 0x50, 0x80 }; |
129 | static u8 adc_ctl_1_cfg [] = { 0x8E, 0x40 }; | 129 | static u8 adc_ctl_1_cfg [] = { 0x8E, 0x40 }; |
130 | static u8 agc_cfg [] = { 0x67, 0x10, 0x23, 0x00, 0xFF, 0xFF, | 130 | static u8 agc_cfg [] = { 0x67, 0x10, 0x23, 0x00, 0xFF, 0xFF, |
131 | 0x00, 0xFF, 0x00, 0x40, 0x40 }; | 131 | 0x00, 0xFF, 0x00, 0x40, 0x40 }; |
132 | static u8 dntv_extra[] = { 0xB5, 0x7A }; | 132 | static u8 dntv_extra[] = { 0xB5, 0x7A }; |
133 | static u8 capt_range_cfg[] = { 0x75, 0x32 }; | 133 | static u8 capt_range_cfg[] = { 0x75, 0x32 }; |
134 | 134 | ||
diff --git a/drivers/media/video/saa7134/saa7134-alsa.c b/drivers/media/video/saa7134/saa7134-alsa.c index e9ffe8f144ac..e7c3691fc500 100644 --- a/drivers/media/video/saa7134/saa7134-alsa.c +++ b/drivers/media/video/saa7134/saa7134-alsa.c | |||
@@ -277,7 +277,7 @@ static int dsp_buffer_init(struct saa7134_dev *dev) | |||
277 | BUG(); | 277 | BUG(); |
278 | videobuf_dma_init(&dev->oss.dma); | 278 | videobuf_dma_init(&dev->oss.dma); |
279 | err = videobuf_dma_init_kernel(&dev->oss.dma, PCI_DMA_FROMDEVICE, | 279 | err = videobuf_dma_init_kernel(&dev->oss.dma, PCI_DMA_FROMDEVICE, |
280 | (dev->oss.bufsize + PAGE_SIZE) >> PAGE_SHIFT); | 280 | (dev->oss.bufsize + PAGE_SIZE) >> PAGE_SHIFT); |
281 | if (0 != err) | 281 | if (0 != err) |
282 | return err; | 282 | return err; |
283 | return 0; | 283 | return 0; |
@@ -336,9 +336,9 @@ static int snd_card_saa7134_capture_prepare(snd_pcm_substream_t * substream) | |||
336 | if (0 != (err = saa7134_pgtable_alloc(dev->pci,&dev->oss.pt))) | 336 | if (0 != (err = saa7134_pgtable_alloc(dev->pci,&dev->oss.pt))) |
337 | goto fail1; | 337 | goto fail1; |
338 | if (0 != (err = saa7134_pgtable_build(dev->pci,&dev->oss.pt, | 338 | if (0 != (err = saa7134_pgtable_build(dev->pci,&dev->oss.pt, |
339 | dev->oss.dma.sglist, | 339 | dev->oss.dma.sglist, |
340 | dev->oss.dma.sglen, | 340 | dev->oss.dma.sglen, |
341 | 0))) | 341 | 0))) |
342 | goto fail2; | 342 | goto fail2; |
343 | 343 | ||
344 | 344 | ||
@@ -481,8 +481,8 @@ static snd_pcm_uframes_t snd_card_saa7134_capture_pointer(snd_pcm_substream_t * | |||
481 | static snd_pcm_hardware_t snd_card_saa7134_capture = | 481 | static snd_pcm_hardware_t snd_card_saa7134_capture = |
482 | { | 482 | { |
483 | .info = (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED | | 483 | .info = (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED | |
484 | SNDRV_PCM_INFO_BLOCK_TRANSFER | | 484 | SNDRV_PCM_INFO_BLOCK_TRANSFER | |
485 | SNDRV_PCM_INFO_MMAP_VALID), | 485 | SNDRV_PCM_INFO_MMAP_VALID), |
486 | .formats = USE_FORMATS, | 486 | .formats = USE_FORMATS, |
487 | .rates = USE_RATE, | 487 | .rates = USE_RATE, |
488 | .rate_min = USE_RATE_MIN, | 488 | .rate_min = USE_RATE_MIN, |
diff --git a/drivers/media/video/saa7134/saa7134-dvb.c b/drivers/media/video/saa7134/saa7134-dvb.c index 5aadd44c2fa2..342891d431a8 100644 --- a/drivers/media/video/saa7134/saa7134-dvb.c +++ b/drivers/media/video/saa7134/saa7134-dvb.c | |||
@@ -547,7 +547,7 @@ static int philips_tda827x_pll_set(struct dvb_frontend *fe, struct dvb_frontend_ | |||
547 | u8 tuner_buf[14]; | 547 | u8 tuner_buf[14]; |
548 | 548 | ||
549 | struct i2c_msg tuner_msg = {.addr = 0x60,.flags = 0,.buf = tuner_buf, | 549 | struct i2c_msg tuner_msg = {.addr = 0x60,.flags = 0,.buf = tuner_buf, |
550 | .len = sizeof(tuner_buf) }; | 550 | .len = sizeof(tuner_buf) }; |
551 | int i, tuner_freq, if_freq; | 551 | int i, tuner_freq, if_freq; |
552 | u32 N; | 552 | u32 N; |
553 | switch (params->u.ofdm.bandwidth) { | 553 | switch (params->u.ofdm.bandwidth) { |
@@ -606,7 +606,7 @@ static void philips_tda827x_pll_sleep(struct dvb_frontend *fe) | |||
606 | struct saa7134_dev *dev = fe->dvb->priv; | 606 | struct saa7134_dev *dev = fe->dvb->priv; |
607 | static u8 tda827x_sleep[] = { 0x30, 0xd0}; | 607 | static u8 tda827x_sleep[] = { 0x30, 0xd0}; |
608 | struct i2c_msg tuner_msg = {.addr = 0x60,.flags = 0,.buf = tda827x_sleep, | 608 | struct i2c_msg tuner_msg = {.addr = 0x60,.flags = 0,.buf = tda827x_sleep, |
609 | .len = sizeof(tda827x_sleep) }; | 609 | .len = sizeof(tda827x_sleep) }; |
610 | i2c_transfer(&dev->i2c_adap, &tuner_msg, 1); | 610 | i2c_transfer(&dev->i2c_adap, &tuner_msg, 1); |
611 | } | 611 | } |
612 | 612 | ||
diff --git a/drivers/media/video/saa7134/saa7134-input.c b/drivers/media/video/saa7134/saa7134-input.c index 7ce0459989b5..f99dbb729555 100644 --- a/drivers/media/video/saa7134/saa7134-input.c +++ b/drivers/media/video/saa7134/saa7134-input.c | |||
@@ -118,7 +118,7 @@ static IR_KEYTAB_TYPE eztv_codes[IR_KEYTAB_SIZE] = { | |||
118 | [ 1 ] = KEY_TV, // DVR | 118 | [ 1 ] = KEY_TV, // DVR |
119 | [ 21 ] = KEY_DVD, // DVD | 119 | [ 21 ] = KEY_DVD, // DVD |
120 | [ 23 ] = KEY_AUDIO, // music | 120 | [ 23 ] = KEY_AUDIO, // music |
121 | // DVR mode / DVD mode / music mode | 121 | // DVR mode / DVD mode / music mode |
122 | 122 | ||
123 | [ 27 ] = KEY_MUTE, // mute | 123 | [ 27 ] = KEY_MUTE, // mute |
124 | [ 2 ] = KEY_LANGUAGE, // MTS/SAP / audio / autoseek | 124 | [ 2 ] = KEY_LANGUAGE, // MTS/SAP / audio / autoseek |
diff --git a/drivers/media/video/saa7134/saa7134-video.c b/drivers/media/video/saa7134/saa7134-video.c index 86db7fb96efd..caeb47c68b8b 100644 --- a/drivers/media/video/saa7134/saa7134-video.c +++ b/drivers/media/video/saa7134/saa7134-video.c | |||
@@ -1345,8 +1345,8 @@ video_poll(struct file *file, struct poll_table_struct *wait) | |||
1345 | return POLLERR; | 1345 | return POLLERR; |
1346 | } | 1346 | } |
1347 | if (0 != fh->cap.ops->buf_prepare(&fh->cap,fh->cap.read_buf,fh->cap.field)) { | 1347 | if (0 != fh->cap.ops->buf_prepare(&fh->cap,fh->cap.read_buf,fh->cap.field)) { |
1348 | up(&fh->cap.lock); | 1348 | up(&fh->cap.lock); |
1349 | return POLLERR; | 1349 | return POLLERR; |
1350 | } | 1350 | } |
1351 | fh->cap.ops->buf_queue(&fh->cap,fh->cap.read_buf); | 1351 | fh->cap.ops->buf_queue(&fh->cap,fh->cap.read_buf); |
1352 | fh->cap.read_off = 0; | 1352 | fh->cap.read_off = 0; |
diff --git a/drivers/media/video/tvaudio.c b/drivers/media/video/tvaudio.c index e1639a24f77f..75901b030730 100644 --- a/drivers/media/video/tvaudio.c +++ b/drivers/media/video/tvaudio.c | |||
@@ -1028,7 +1028,7 @@ static int tda9874a_initialize(struct CHIPSTATE *chip) | |||
1028 | #define TEA6300_TR 0x03 /* treble */ | 1028 | #define TEA6300_TR 0x03 /* treble */ |
1029 | #define TEA6300_FA 0x04 /* fader control */ | 1029 | #define TEA6300_FA 0x04 /* fader control */ |
1030 | #define TEA6300_S 0x05 /* switch register */ | 1030 | #define TEA6300_S 0x05 /* switch register */ |
1031 | /* values for those registers: */ | 1031 | /* values for those registers: */ |
1032 | #define TEA6300_S_SA 0x01 /* stereo A input */ | 1032 | #define TEA6300_S_SA 0x01 /* stereo A input */ |
1033 | #define TEA6300_S_SB 0x02 /* stereo B */ | 1033 | #define TEA6300_S_SB 0x02 /* stereo B */ |
1034 | #define TEA6300_S_SC 0x04 /* stereo C */ | 1034 | #define TEA6300_S_SC 0x04 /* stereo C */ |
@@ -1042,7 +1042,7 @@ static int tda9874a_initialize(struct CHIPSTATE *chip) | |||
1042 | #define TEA6320_BA 0x05 /* bass (0-4) */ | 1042 | #define TEA6320_BA 0x05 /* bass (0-4) */ |
1043 | #define TEA6320_TR 0x06 /* treble (0-4) */ | 1043 | #define TEA6320_TR 0x06 /* treble (0-4) */ |
1044 | #define TEA6320_S 0x07 /* switch register */ | 1044 | #define TEA6320_S 0x07 /* switch register */ |
1045 | /* values for those registers: */ | 1045 | /* values for those registers: */ |
1046 | #define TEA6320_S_SA 0x07 /* stereo A input */ | 1046 | #define TEA6320_S_SA 0x07 /* stereo A input */ |
1047 | #define TEA6320_S_SB 0x06 /* stereo B */ | 1047 | #define TEA6320_S_SB 0x06 /* stereo B */ |
1048 | #define TEA6320_S_SC 0x05 /* stereo C */ | 1048 | #define TEA6320_S_SC 0x05 /* stereo C */ |
@@ -1082,7 +1082,7 @@ static int tea6320_initialize(struct CHIPSTATE * chip) | |||
1082 | #define TDA8425_BA 0x02 /* bass */ | 1082 | #define TDA8425_BA 0x02 /* bass */ |
1083 | #define TDA8425_TR 0x03 /* treble */ | 1083 | #define TDA8425_TR 0x03 /* treble */ |
1084 | #define TDA8425_S1 0x08 /* switch functions */ | 1084 | #define TDA8425_S1 0x08 /* switch functions */ |
1085 | /* values for those registers: */ | 1085 | /* values for those registers: */ |
1086 | #define TDA8425_S1_OFF 0xEE /* audio off (mute on) */ | 1086 | #define TDA8425_S1_OFF 0xEE /* audio off (mute on) */ |
1087 | #define TDA8425_S1_CH1 0xCE /* audio channel 1 (mute off) - "linear stereo" mode */ | 1087 | #define TDA8425_S1_CH1 0xCE /* audio channel 1 (mute off) - "linear stereo" mode */ |
1088 | #define TDA8425_S1_CH2 0xCF /* audio channel 2 (mute off) - "linear stereo" mode */ | 1088 | #define TDA8425_S1_CH2 0xCF /* audio channel 2 (mute off) - "linear stereo" mode */ |
@@ -1148,7 +1148,7 @@ static void tda8425_setmode(struct CHIPSTATE *chip, int mode) | |||
1148 | 1148 | ||
1149 | /* bit definition of the RESET register, I2C data. */ | 1149 | /* bit definition of the RESET register, I2C data. */ |
1150 | #define PIC16C54_MISC_RESET_REMOTE_CTL 0x01 /* bit 0, Reset to receive the key */ | 1150 | #define PIC16C54_MISC_RESET_REMOTE_CTL 0x01 /* bit 0, Reset to receive the key */ |
1151 | /* code of remote controller */ | 1151 | /* code of remote controller */ |
1152 | #define PIC16C54_MISC_MTS_MAIN 0x02 /* bit 1 */ | 1152 | #define PIC16C54_MISC_MTS_MAIN 0x02 /* bit 1 */ |
1153 | #define PIC16C54_MISC_MTS_SAP 0x04 /* bit 2 */ | 1153 | #define PIC16C54_MISC_MTS_SAP 0x04 /* bit 2 */ |
1154 | #define PIC16C54_MISC_MTS_BOTH 0x08 /* bit 3 */ | 1154 | #define PIC16C54_MISC_MTS_BOTH 0x08 /* bit 3 */ |
diff --git a/drivers/media/video/tveeprom.c b/drivers/media/video/tveeprom.c index 68128e04dacc..d83a33618119 100644 --- a/drivers/media/video/tveeprom.c +++ b/drivers/media/video/tveeprom.c | |||
@@ -331,7 +331,7 @@ static int hasRadioTuner(int tunerType) | |||
331 | } | 331 | } |
332 | 332 | ||
333 | void tveeprom_hauppauge_analog(struct i2c_client *c, struct tveeprom *tvee, | 333 | void tveeprom_hauppauge_analog(struct i2c_client *c, struct tveeprom *tvee, |
334 | unsigned char *eeprom_data) | 334 | unsigned char *eeprom_data) |
335 | { | 335 | { |
336 | /* ---------------------------------------------- | 336 | /* ---------------------------------------------- |
337 | ** The hauppauge eeprom format is tagged | 337 | ** The hauppauge eeprom format is tagged |