diff options
author | Palash Bandyopadhyay <Palash.Bandyopadhyay@conexant.com> | 2010-07-04 13:15:38 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-08-02 14:18:44 -0400 |
commit | 6d8c2ba1d154f2a94303fc92691887525065199e (patch) | |
tree | e61e6c9d6301406964851aecccc3a02ac634fc30 /drivers/staging/cx25821/cx25821-video.h | |
parent | fab8125919c0fc724e11b184b1c812dfb8990549 (diff) |
V4L/DVB: cx25821: Removed duplicate code and cleaned up
Signed-off-by: Palash Bandyopadhyay <Palash.Bandyopadhyay@conexant.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/staging/cx25821/cx25821-video.h')
-rw-r--r-- | drivers/staging/cx25821/cx25821-video.h | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/drivers/staging/cx25821/cx25821-video.h b/drivers/staging/cx25821/cx25821-video.h index 0bddc02be57..513eaba406e 100644 --- a/drivers/staging/cx25821/cx25821-video.h +++ b/drivers/staging/cx25821/cx25821-video.h | |||
@@ -80,17 +80,6 @@ extern struct sram_channel *channel7; | |||
80 | extern struct sram_channel *channel9; | 80 | extern struct sram_channel *channel9; |
81 | extern struct sram_channel *channel10; | 81 | extern struct sram_channel *channel10; |
82 | extern struct sram_channel *channel11; | 82 | extern struct sram_channel *channel11; |
83 | extern struct video_device cx25821_video_template0; | ||
84 | extern struct video_device cx25821_video_template1; | ||
85 | extern struct video_device cx25821_video_template2; | ||
86 | extern struct video_device cx25821_video_template3; | ||
87 | extern struct video_device cx25821_video_template4; | ||
88 | extern struct video_device cx25821_video_template5; | ||
89 | extern struct video_device cx25821_video_template6; | ||
90 | extern struct video_device cx25821_video_template7; | ||
91 | extern struct video_device cx25821_video_template9; | ||
92 | extern struct video_device cx25821_video_template10; | ||
93 | extern struct video_device cx25821_video_template11; | ||
94 | extern struct video_device cx25821_videoioctl_template; | 83 | extern struct video_device cx25821_videoioctl_template; |
95 | //extern const u32 *ctrl_classes[]; | 84 | //extern const u32 *ctrl_classes[]; |
96 | 85 | ||
@@ -113,7 +102,7 @@ extern int cx25821_set_tvnorm(struct cx25821_dev *dev, v4l2_std_id norm); | |||
113 | extern int cx25821_res_get(struct cx25821_dev *dev, struct cx25821_fh *fh, | 102 | extern int cx25821_res_get(struct cx25821_dev *dev, struct cx25821_fh *fh, |
114 | unsigned int bit); | 103 | unsigned int bit); |
115 | extern int cx25821_res_check(struct cx25821_fh *fh, unsigned int bit); | 104 | extern int cx25821_res_check(struct cx25821_fh *fh, unsigned int bit); |
116 | extern int cx25821_res_locked(struct cx25821_dev *dev, unsigned int bit); | 105 | extern int cx25821_res_locked(struct cx25821_fh *fh, unsigned int bit); |
117 | extern void cx25821_res_free(struct cx25821_dev *dev, struct cx25821_fh *fh, | 106 | extern void cx25821_res_free(struct cx25821_dev *dev, struct cx25821_fh *fh, |
118 | unsigned int bits); | 107 | unsigned int bits); |
119 | extern int cx25821_video_mux(struct cx25821_dev *dev, unsigned int input); | 108 | extern int cx25821_video_mux(struct cx25821_dev *dev, unsigned int input); |
@@ -126,8 +115,7 @@ extern int cx25821_set_scale(struct cx25821_dev *dev, unsigned int width, | |||
126 | unsigned int height, enum v4l2_field field); | 115 | unsigned int height, enum v4l2_field field); |
127 | extern int cx25821_video_irq(struct cx25821_dev *dev, int chan_num, u32 status); | 116 | extern int cx25821_video_irq(struct cx25821_dev *dev, int chan_num, u32 status); |
128 | extern void cx25821_video_unregister(struct cx25821_dev *dev, int chan_num); | 117 | extern void cx25821_video_unregister(struct cx25821_dev *dev, int chan_num); |
129 | extern int cx25821_video_register(struct cx25821_dev *dev, int chan_num, | 118 | extern int cx25821_video_register(struct cx25821_dev *dev); |
130 | struct video_device *video_template); | ||
131 | extern int cx25821_get_format_size(void); | 119 | extern int cx25821_get_format_size(void); |
132 | 120 | ||
133 | extern int cx25821_buffer_setup(struct videobuf_queue *q, unsigned int *count, | 121 | extern int cx25821_buffer_setup(struct videobuf_queue *q, unsigned int *count, |