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/saa7134 | |
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/saa7134')
-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 |
4 files changed, 11 insertions, 11 deletions
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; |