aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/cx88/cx88-video.c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@brturbo.com.br>2005-11-09 00:37:43 -0500
committerLinus Torvalds <torvalds@g5.osdl.org>2005-11-09 10:56:20 -0500
commit4ac97914c6c35f6bf132071c718e034d0846b9f5 (patch)
tree98c7eb827bb8ba99730ed89d32703a30448fd813 /drivers/media/video/cx88/cx88-video.c
parenta8900fc242406f25f315190a6d650f1d54617c2f (diff)
[PATCH] v4l: 800: whitespace cleanups
- Whitespace 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/cx88/cx88-video.c')
-rw-r--r--drivers/media/video/cx88/cx88-video.c22
1 files changed, 11 insertions, 11 deletions
diff --git a/drivers/media/video/cx88/cx88-video.c b/drivers/media/video/cx88/cx88-video.c
index 4c99fc39bb2a..f22ccb65de1c 100644
--- a/drivers/media/video/cx88/cx88-video.c
+++ b/drivers/media/video/cx88/cx88-video.c
@@ -100,7 +100,7 @@ static struct cx88_tvnorm tvnorms[] = {
100 .id = V4L2_STD_PAL_I, 100 .id = V4L2_STD_PAL_I,
101 .cxiformat = VideoFormatPAL, 101 .cxiformat = VideoFormatPAL,
102 .cxoformat = 0x181f0008, 102 .cxoformat = 0x181f0008,
103 },{ 103 },{
104 .name = "PAL-M", 104 .name = "PAL-M",
105 .id = V4L2_STD_PAL_M, 105 .id = V4L2_STD_PAL_M,
106 .cxiformat = VideoFormatPALM, 106 .cxiformat = VideoFormatPALM,
@@ -470,7 +470,7 @@ static int restart_video_queue(struct cx8800_dev *dev,
470 struct list_head *item; 470 struct list_head *item;
471 471
472 if (!list_empty(&q->active)) { 472 if (!list_empty(&q->active)) {
473 buf = list_entry(q->active.next, struct cx88_buffer, vb.queue); 473 buf = list_entry(q->active.next, struct cx88_buffer, vb.queue);
474 dprintk(2,"restart_queue [%p/%d]: restart dma\n", 474 dprintk(2,"restart_queue [%p/%d]: restart dma\n",
475 buf, buf->vb.i); 475 buf, buf->vb.i);
476 start_video_dma(dev, q, buf); 476 start_video_dma(dev, q, buf);
@@ -486,7 +486,7 @@ static int restart_video_queue(struct cx8800_dev *dev,
486 for (;;) { 486 for (;;) {
487 if (list_empty(&q->queued)) 487 if (list_empty(&q->queued))
488 return 0; 488 return 0;
489 buf = list_entry(q->queued.next, struct cx88_buffer, vb.queue); 489 buf = list_entry(q->queued.next, struct cx88_buffer, vb.queue);
490 if (NULL == prev) { 490 if (NULL == prev) {
491 list_del(&buf->vb.queue); 491 list_del(&buf->vb.queue);
492 list_add_tail(&buf->vb.queue,&q->active); 492 list_add_tail(&buf->vb.queue,&q->active);
@@ -783,7 +783,7 @@ static int video_open(struct inode *inode, struct file *file)
783 cx88_call_i2c_clients(core,AUDC_SET_RADIO,NULL); 783 cx88_call_i2c_clients(core,AUDC_SET_RADIO,NULL);
784 } 784 }
785 785
786 return 0; 786 return 0;
787} 787}
788 788
789static ssize_t 789static ssize_t
@@ -922,7 +922,7 @@ static int set_control(struct cx88_core *core, struct v4l2_control *ctl)
922{ 922{
923 /* struct cx88_core *core = dev->core; */ 923 /* struct cx88_core *core = dev->core; */
924 struct cx88_ctrl *c = NULL; 924 struct cx88_ctrl *c = NULL;
925 u32 v_sat_value; 925 u32 v_sat_value;
926 u32 value; 926 u32 value;
927 int i; 927 int i;
928 928
@@ -1252,7 +1252,7 @@ static int video_do_ioctl(struct inode *inode, struct file *file,
1252} 1252}
1253 1253
1254int cx88_do_ioctl(struct inode *inode, struct file *file, int radio, 1254int cx88_do_ioctl(struct inode *inode, struct file *file, int radio,
1255 struct cx88_core *core, unsigned int cmd, void *arg, v4l2_kioctl driver_ioctl) 1255 struct cx88_core *core, unsigned int cmd, void *arg, v4l2_kioctl driver_ioctl)
1256{ 1256{
1257 int err; 1257 int err;
1258 1258
@@ -1399,7 +1399,7 @@ int cx88_do_ioctl(struct inode *inode, struct file *file, int radio,
1399 1399
1400 cx88_get_stereo(core ,t); 1400 cx88_get_stereo(core ,t);
1401 reg = cx_read(MO_DEVICE_STATUS); 1401 reg = cx_read(MO_DEVICE_STATUS);
1402 t->signal = (reg & (1<<5)) ? 0xffff : 0x0000; 1402 t->signal = (reg & (1<<5)) ? 0xffff : 0x0000;
1403 return 0; 1403 return 0;
1404 } 1404 }
1405 case VIDIOC_S_TUNER: 1405 case VIDIOC_S_TUNER:
@@ -1486,7 +1486,7 @@ static int radio_do_ioctl(struct inode *inode, struct file *file,
1486 struct v4l2_capability *cap = arg; 1486 struct v4l2_capability *cap = arg;
1487 1487
1488 memset(cap,0,sizeof(*cap)); 1488 memset(cap,0,sizeof(*cap));
1489 strcpy(cap->driver, "cx8800"); 1489 strcpy(cap->driver, "cx8800");
1490 strlcpy(cap->card, cx88_boards[core->board].name, 1490 strlcpy(cap->card, cx88_boards[core->board].name,
1491 sizeof(cap->card)); 1491 sizeof(cap->card));
1492 sprintf(cap->bus_info,"PCI:%s", pci_name(dev->pci)); 1492 sprintf(cap->bus_info,"PCI:%s", pci_name(dev->pci));
@@ -1827,8 +1827,8 @@ static int __devinit cx8800_initdev(struct pci_dev *pci_dev,
1827 1827
1828 /* print pci info */ 1828 /* print pci info */
1829 pci_read_config_byte(pci_dev, PCI_CLASS_REVISION, &dev->pci_rev); 1829 pci_read_config_byte(pci_dev, PCI_CLASS_REVISION, &dev->pci_rev);
1830 pci_read_config_byte(pci_dev, PCI_LATENCY_TIMER, &dev->pci_lat); 1830 pci_read_config_byte(pci_dev, PCI_LATENCY_TIMER, &dev->pci_lat);
1831 printk(KERN_INFO "%s/0: found at %s, rev: %d, irq: %d, " 1831 printk(KERN_INFO "%s/0: found at %s, rev: %d, irq: %d, "
1832 "latency: %d, mmio: 0x%lx\n", core->name, 1832 "latency: %d, mmio: 0x%lx\n", core->name,
1833 pci_name(pci_dev), dev->pci_rev, pci_dev->irq, 1833 pci_name(pci_dev), dev->pci_rev, pci_dev->irq,
1834 dev->pci_lat,pci_resource_start(pci_dev,0)); 1834 dev->pci_lat,pci_resource_start(pci_dev,0));
@@ -1944,7 +1944,7 @@ fail_free:
1944 1944
1945static void __devexit cx8800_finidev(struct pci_dev *pci_dev) 1945static void __devexit cx8800_finidev(struct pci_dev *pci_dev)
1946{ 1946{
1947 struct cx8800_dev *dev = pci_get_drvdata(pci_dev); 1947 struct cx8800_dev *dev = pci_get_drvdata(pci_dev);
1948 struct cx88_core *core = dev->core; 1948 struct cx88_core *core = dev->core;
1949 1949
1950 /* stop thread */ 1950 /* stop thread */