diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-06-17 07:47:17 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-06-17 07:47:17 -0300 |
| commit | 2937fa2721fcd3b1b938c2fe924985845914361f (patch) | |
| tree | c56737532155ea0eab91c69bacd269ca3cfbc729 /linux/drivers/media/video/pwc | |
| parent | 7573bcc39485ab7aae4cba4a2a662cba0829becf (diff) | |
| download | mediapointer-dvb-s2-2937fa2721fcd3b1b938c2fe924985845914361f.tar.gz mediapointer-dvb-s2-2937fa2721fcd3b1b938c2fe924985845914361f.tar.bz2 | |
Remove non-functional local version of v4l_printk_ioctl()
From: Trent Piepho <xyzzy@speakeasy.org>
Remove code that tries to handle backward compatibility for
v4l_printk_ioctl(), but ironically has the opposite effect. For kernels
< 2.6.16, a local version of v4l_printk_ioctl(), which doesn't even
compile, is removed. For kernels >= 2.6.16, the unnecessary extern
prototype is removed, as the function is prototyped in
media/v4l2-common.h.
Signed-off-by: Trent Piepho <xyzzy@speakeasy.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/pwc')
| -rw-r--r-- | linux/drivers/media/video/pwc/pwc-v4l.c | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/linux/drivers/media/video/pwc/pwc-v4l.c b/linux/drivers/media/video/pwc/pwc-v4l.c index df4bbdb1e..86faadd48 100644 --- a/linux/drivers/media/video/pwc/pwc-v4l.c +++ b/linux/drivers/media/video/pwc/pwc-v4l.c @@ -212,20 +212,6 @@ static struct v4l2_queryctrl pwc_controls[] = { #endif }; -#if CONFIG_PWC_DEBUG -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,16) -static const char *v4l1_ioctls[] = { - "?", "CGAP", "GCHAN", "SCHAN", "GTUNER", "STUNER", "GPICT", "SPICT", - "CCAPTURE", "GWIN", "SWIN", "GFBUF", "SFBUF", "KEY", "GFREQ", - "SFREQ", "GAUDIO", "SAUDIO", "SYNC", "MCAPTURE", "GMBUF", "GUNIT", - "GCAPTURE", "SCAPTURE", "SPLAYMODE", "SWRITEMODE", "GPLAYINFO", - "SMICROCODE", "GVBIFMT", "SVBIFMT" }; -#define V4L1_IOCTLS ARRAY_SIZE(v4l1_ioctls) -#else -/* In 2.6.16-rc1 v4l_printk_ioctl is not defined but exported */ -extern void v4l_printk_ioctl(unsigned int cmd); -#endif -#endif static void pwc_vidioc_fill_fmt(const struct pwc_device *pdev, struct v4l2_format *f) { @@ -367,24 +353,9 @@ int pwc_video_do_ioctl(struct inode *inode, struct file *file, return -EFAULT; #if CONFIG_PWC_DEBUG -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,16) - switch (_IOC_TYPE(cmd)) { - case 'v': - PWC_DEBUG_IOCTL("ioctl 0x%x (v4l1, VIDIOC%s)\n", cmd, - (_IOC_NR(cmd) < V4L1_IOCTLS) ? v4l1_ioctls[_IOC_NR(cmd)] : "???"); - break; - case 'V': - PWC_DEBUG_IOCTL("ioctl 0x%x (v4l2, %s)\n", cmd, - v4l2_ioctl_names[_IOC_NR(cmd)]); - break; - default: - PWC_DEBUG_IOCTL("ioctl 0x%x (unknown)\n", cmd); - } -#else if (PWC_DEBUG_LEVEL_IOCTL & pwc_trace) v4l_printk_ioctl(cmd); #endif -#endif switch (cmd) { |