diff options
author | Steven Toth <stoth@linuxtv.org> | 2008-10-16 19:18:44 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-10-17 16:27:23 -0400 |
commit | 9c8ced511e154faf1a7af3f1abdfff45dccbe54a (patch) | |
tree | 6c609e6124c7999abbc6df6410545ae0ba5e9bc2 /drivers/media/video/cx23885/cx23885-dvb.c | |
parent | 2af03eeadf460656642c2553c783537e7ad02875 (diff) |
V4L/DVB (9251): cx23885: Checkpatch compliance
cx23885: Checkpatch compliance
Signed-off-by: Steven Toth <stoth@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/cx23885/cx23885-dvb.c')
-rw-r--r-- | drivers/media/video/cx23885/cx23885-dvb.c | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/drivers/media/video/cx23885/cx23885-dvb.c b/drivers/media/video/cx23885/cx23885-dvb.c index 9dfc96008551..8e9871106afa 100644 --- a/drivers/media/video/cx23885/cx23885-dvb.c +++ b/drivers/media/video/cx23885/cx23885-dvb.c | |||
@@ -78,19 +78,19 @@ static int dvb_buf_prepare(struct videobuf_queue *q, | |||
78 | struct videobuf_buffer *vb, enum v4l2_field field) | 78 | struct videobuf_buffer *vb, enum v4l2_field field) |
79 | { | 79 | { |
80 | struct cx23885_tsport *port = q->priv_data; | 80 | struct cx23885_tsport *port = q->priv_data; |
81 | return cx23885_buf_prepare(q, port, (struct cx23885_buffer*)vb, field); | 81 | return cx23885_buf_prepare(q, port, (struct cx23885_buffer *)vb, field); |
82 | } | 82 | } |
83 | 83 | ||
84 | static void dvb_buf_queue(struct videobuf_queue *q, struct videobuf_buffer *vb) | 84 | static void dvb_buf_queue(struct videobuf_queue *q, struct videobuf_buffer *vb) |
85 | { | 85 | { |
86 | struct cx23885_tsport *port = q->priv_data; | 86 | struct cx23885_tsport *port = q->priv_data; |
87 | cx23885_buf_queue(port, (struct cx23885_buffer*)vb); | 87 | cx23885_buf_queue(port, (struct cx23885_buffer *)vb); |
88 | } | 88 | } |
89 | 89 | ||
90 | static void dvb_buf_release(struct videobuf_queue *q, | 90 | static void dvb_buf_release(struct videobuf_queue *q, |
91 | struct videobuf_buffer *vb) | 91 | struct videobuf_buffer *vb) |
92 | { | 92 | { |
93 | cx23885_free_buffer(q, (struct cx23885_buffer*)vb); | 93 | cx23885_free_buffer(q, (struct cx23885_buffer *)vb); |
94 | } | 94 | } |
95 | 95 | ||
96 | static struct videobuf_queue_ops dvb_qops = { | 96 | static struct videobuf_queue_ops dvb_qops = { |
@@ -450,7 +450,8 @@ static int dvb_register(struct cx23885_tsport *port) | |||
450 | .fname = XC3028L_DEFAULT_FIRMWARE, | 450 | .fname = XC3028L_DEFAULT_FIRMWARE, |
451 | .max_len = 64, | 451 | .max_len = 64, |
452 | .demod = 5000, | 452 | .demod = 5000, |
453 | /* This is true for all demods with v36 firmware? */ | 453 | /* This is true for all demods with |
454 | v36 firmware? */ | ||
454 | .type = XC2028_D2633, | 455 | .type = XC2028_D2633, |
455 | }; | 456 | }; |
456 | 457 | ||
@@ -525,12 +526,14 @@ static int dvb_register(struct cx23885_tsport *port) | |||
525 | } | 526 | } |
526 | break; | 527 | break; |
527 | default: | 528 | default: |
528 | printk("%s: The frontend of your DVB/ATSC card isn't supported yet\n", | 529 | printk(KERN_INFO "%s: The frontend of your DVB/ATSC card " |
530 | " isn't supported yet\n", | ||
529 | dev->name); | 531 | dev->name); |
530 | break; | 532 | break; |
531 | } | 533 | } |
532 | if (NULL == fe0->dvb.frontend) { | 534 | if (NULL == fe0->dvb.frontend) { |
533 | printk("%s: frontend initialization failed\n", dev->name); | 535 | printk(KERN_ERR "%s: frontend initialization failed\n", |
536 | dev->name); | ||
534 | return -1; | 537 | return -1; |
535 | } | 538 | } |
536 | /* define general-purpose callback pointer */ | 539 | /* define general-purpose callback pointer */ |
@@ -568,7 +571,8 @@ int cx23885_dvb_register(struct cx23885_tsport *port) | |||
568 | port->num_frontends); | 571 | port->num_frontends); |
569 | 572 | ||
570 | for (i = 1; i <= port->num_frontends; i++) { | 573 | for (i = 1; i <= port->num_frontends; i++) { |
571 | if (videobuf_dvb_alloc_frontend(dev, &port->frontends, i) == NULL) { | 574 | if (videobuf_dvb_alloc_frontend(dev, |
575 | &port->frontends, i) == NULL) { | ||
572 | printk(KERN_ERR "%s() failed to alloc\n", __func__); | 576 | printk(KERN_ERR "%s() failed to alloc\n", __func__); |
573 | return -ENOMEM; | 577 | return -ENOMEM; |
574 | } | 578 | } |
@@ -578,7 +582,7 @@ int cx23885_dvb_register(struct cx23885_tsport *port) | |||
578 | err = -EINVAL; | 582 | err = -EINVAL; |
579 | 583 | ||
580 | dprintk(1, "%s\n", __func__); | 584 | dprintk(1, "%s\n", __func__); |
581 | dprintk(1, " ->being probed by Card=%d Name=%s, PCI %02x:%02x\n", | 585 | dprintk(1, " ->probed by Card=%d Name=%s, PCI %02x:%02x\n", |
582 | dev->board, | 586 | dev->board, |
583 | dev->name, | 587 | dev->name, |
584 | dev->pci_bus, | 588 | dev->pci_bus, |
@@ -588,14 +592,16 @@ int cx23885_dvb_register(struct cx23885_tsport *port) | |||
588 | 592 | ||
589 | /* dvb stuff */ | 593 | /* dvb stuff */ |
590 | /* We have to init the queue for each frontend on a port. */ | 594 | /* We have to init the queue for each frontend on a port. */ |
591 | printk("%s: cx23885 based dvb card\n", dev->name); | 595 | printk(KERN_INFO "%s: cx23885 based dvb card\n", dev->name); |
592 | videobuf_queue_sg_init(&fe0->dvb.dvbq, &dvb_qops, &dev->pci->dev, &port->slock, | 596 | videobuf_queue_sg_init(&fe0->dvb.dvbq, &dvb_qops, |
597 | &dev->pci->dev, &port->slock, | ||
593 | V4L2_BUF_TYPE_VIDEO_CAPTURE, V4L2_FIELD_TOP, | 598 | V4L2_BUF_TYPE_VIDEO_CAPTURE, V4L2_FIELD_TOP, |
594 | sizeof(struct cx23885_buffer), port); | 599 | sizeof(struct cx23885_buffer), port); |
595 | } | 600 | } |
596 | err = dvb_register(port); | 601 | err = dvb_register(port); |
597 | if (err != 0) | 602 | if (err != 0) |
598 | printk("%s() dvb_register failed err = %d\n", __func__, err); | 603 | printk(KERN_ERR "%s() dvb_register failed err = %d\n", |
604 | __func__, err); | ||
599 | 605 | ||
600 | return err; | 606 | return err; |
601 | } | 607 | } |
@@ -612,15 +618,9 @@ int cx23885_dvb_unregister(struct cx23885_tsport *port) | |||
612 | * implement MFE support. | 618 | * implement MFE support. |
613 | */ | 619 | */ |
614 | fe0 = videobuf_dvb_get_frontend(&port->frontends, 1); | 620 | fe0 = videobuf_dvb_get_frontend(&port->frontends, 1); |
615 | if(fe0->dvb.frontend) | 621 | if (fe0->dvb.frontend) |
616 | videobuf_dvb_unregister_bus(&port->frontends); | 622 | videobuf_dvb_unregister_bus(&port->frontends); |
617 | 623 | ||
618 | return 0; | 624 | return 0; |
619 | } | 625 | } |
620 | 626 | ||
621 | /* | ||
622 | * Local variables: | ||
623 | * c-basic-offset: 8 | ||
624 | * End: | ||
625 | * kate: eol "unix"; indent-width 3; remove-trailing-space on; replace-trailing-space-save on; tab-width 8; replace-tabs off; space-indent off; mixed-indent off | ||
626 | */ | ||