diff options
author | Adrian Bunk <bunk@kernel.org> | 2007-11-05 12:07:22 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-01-25 16:02:05 -0500 |
commit | a2fbaa519befdb3db2485116518f3af55be604e6 (patch) | |
tree | ea54d90e1ccbed7e6939fc1b84396199319a1ed0 /drivers/media/video/cx88 | |
parent | 39e75cfedf5b40116136894241ca1182089f3637 (diff) |
V4L/DVB (6576): cx88-mpeg.c: make 4 functions static
This patch makes the following needlessly global functions static:
- cx8802_init_common()
- cx8802_fini_common()
- cx8802_suspend_common()
- cx8802_resume_common()
Signed-off-by: Adrian Bunk <bunk@kernel.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video/cx88')
-rw-r--r-- | drivers/media/video/cx88/cx88-mpeg.c | 14 | ||||
-rw-r--r-- | drivers/media/video/cx88/cx88.h | 6 |
2 files changed, 4 insertions, 16 deletions
diff --git a/drivers/media/video/cx88/cx88-mpeg.c b/drivers/media/video/cx88/cx88-mpeg.c index 448c67380945..60ac4234d84c 100644 --- a/drivers/media/video/cx88/cx88-mpeg.c +++ b/drivers/media/video/cx88/cx88-mpeg.c | |||
@@ -437,10 +437,7 @@ static irqreturn_t cx8802_irq(int irq, void *dev_id) | |||
437 | return IRQ_RETVAL(handled); | 437 | return IRQ_RETVAL(handled); |
438 | } | 438 | } |
439 | 439 | ||
440 | /* ----------------------------------------------------------- */ | 440 | static int cx8802_init_common(struct cx8802_dev *dev) |
441 | /* exported stuff */ | ||
442 | |||
443 | int cx8802_init_common(struct cx8802_dev *dev) | ||
444 | { | 441 | { |
445 | struct cx88_core *core = dev->core; | 442 | struct cx88_core *core = dev->core; |
446 | int err; | 443 | int err; |
@@ -488,7 +485,7 @@ int cx8802_init_common(struct cx8802_dev *dev) | |||
488 | return 0; | 485 | return 0; |
489 | } | 486 | } |
490 | 487 | ||
491 | void cx8802_fini_common(struct cx8802_dev *dev) | 488 | static void cx8802_fini_common(struct cx8802_dev *dev) |
492 | { | 489 | { |
493 | dprintk( 2, "cx8802_fini_common\n" ); | 490 | dprintk( 2, "cx8802_fini_common\n" ); |
494 | cx8802_stop_dma(dev); | 491 | cx8802_stop_dma(dev); |
@@ -504,7 +501,7 @@ void cx8802_fini_common(struct cx8802_dev *dev) | |||
504 | 501 | ||
505 | /* ----------------------------------------------------------- */ | 502 | /* ----------------------------------------------------------- */ |
506 | 503 | ||
507 | int cx8802_suspend_common(struct pci_dev *pci_dev, pm_message_t state) | 504 | static int cx8802_suspend_common(struct pci_dev *pci_dev, pm_message_t state) |
508 | { | 505 | { |
509 | struct cx8802_dev *dev = pci_get_drvdata(pci_dev); | 506 | struct cx8802_dev *dev = pci_get_drvdata(pci_dev); |
510 | struct cx88_core *core = dev->core; | 507 | struct cx88_core *core = dev->core; |
@@ -530,7 +527,7 @@ int cx8802_suspend_common(struct pci_dev *pci_dev, pm_message_t state) | |||
530 | return 0; | 527 | return 0; |
531 | } | 528 | } |
532 | 529 | ||
533 | int cx8802_resume_common(struct pci_dev *pci_dev) | 530 | static int cx8802_resume_common(struct pci_dev *pci_dev) |
534 | { | 531 | { |
535 | struct cx8802_dev *dev = pci_get_drvdata(pci_dev); | 532 | struct cx8802_dev *dev = pci_get_drvdata(pci_dev); |
536 | struct cx88_core *core = dev->core; | 533 | struct cx88_core *core = dev->core; |
@@ -874,9 +871,6 @@ EXPORT_SYMBOL(cx8802_buf_prepare); | |||
874 | EXPORT_SYMBOL(cx8802_buf_queue); | 871 | EXPORT_SYMBOL(cx8802_buf_queue); |
875 | EXPORT_SYMBOL(cx8802_cancel_buffers); | 872 | EXPORT_SYMBOL(cx8802_cancel_buffers); |
876 | 873 | ||
877 | EXPORT_SYMBOL(cx8802_init_common); | ||
878 | EXPORT_SYMBOL(cx8802_fini_common); | ||
879 | |||
880 | EXPORT_SYMBOL(cx8802_register_driver); | 874 | EXPORT_SYMBOL(cx8802_register_driver); |
881 | EXPORT_SYMBOL(cx8802_unregister_driver); | 875 | EXPORT_SYMBOL(cx8802_unregister_driver); |
882 | EXPORT_SYMBOL(cx8802_get_driver); | 876 | EXPORT_SYMBOL(cx8802_get_driver); |
diff --git a/drivers/media/video/cx88/cx88.h b/drivers/media/video/cx88/cx88.h index eb296bdecb1e..bb1036a5c6c6 100644 --- a/drivers/media/video/cx88/cx88.h +++ b/drivers/media/video/cx88/cx88.h | |||
@@ -633,12 +633,6 @@ int cx8802_buf_prepare(struct videobuf_queue *q,struct cx8802_dev *dev, | |||
633 | void cx8802_buf_queue(struct cx8802_dev *dev, struct cx88_buffer *buf); | 633 | void cx8802_buf_queue(struct cx8802_dev *dev, struct cx88_buffer *buf); |
634 | void cx8802_cancel_buffers(struct cx8802_dev *dev); | 634 | void cx8802_cancel_buffers(struct cx8802_dev *dev); |
635 | 635 | ||
636 | int cx8802_init_common(struct cx8802_dev *dev); | ||
637 | void cx8802_fini_common(struct cx8802_dev *dev); | ||
638 | |||
639 | int cx8802_suspend_common(struct pci_dev *pci_dev, pm_message_t state); | ||
640 | int cx8802_resume_common(struct pci_dev *pci_dev); | ||
641 | |||
642 | /* ----------------------------------------------------------- */ | 636 | /* ----------------------------------------------------------- */ |
643 | /* cx88-video.c*/ | 637 | /* cx88-video.c*/ |
644 | extern const u32 cx88_user_ctrls[]; | 638 | extern const u32 cx88_user_ctrls[]; |