From: Tomas Winkler Date: Tue, 15 Feb 2011 12:15:18 +0000 (+0200) Subject: staging/easycap: kill EASYCAP_NEEDS_V4L2_DEVICE_H and EASYCAP_NEEDS_V4L2_FOPS X-Git-Tag: v2.6.39-rc1~469^2~547 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=30516058;p=karo-tx-linux.git staging/easycap: kill EASYCAP_NEEDS_V4L2_DEVICE_H and EASYCAP_NEEDS_V4L2_FOPS EASYCAP_NEEDS_V4L2_DEVICE_H and EASYCAP_NEEDS_V4L2_FOPS are required in in-tree driver Cc: Mike Thomas Signed-off-by: Tomas Winkler Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/easycap/Makefile b/drivers/staging/easycap/Makefile index 987ccb184f57..1f9331ba4882 100644 --- a/drivers/staging/easycap/Makefile +++ b/drivers/staging/easycap/Makefile @@ -10,6 +10,4 @@ obj-$(CONFIG_EASYCAP) += easycap.o ccflags-y := -Wall ccflags-y += -DEASYCAP_IS_VIDEODEV_CLIENT -ccflags-y += -DEASYCAP_NEEDS_V4L2_DEVICE_H -ccflags-y += -DEASYCAP_NEEDS_V4L2_FOPS diff --git a/drivers/staging/easycap/easycap.h b/drivers/staging/easycap/easycap.h index 55b1a14fa518..fe91257efeaf 100644 --- a/drivers/staging/easycap/easycap.h +++ b/drivers/staging/easycap/easycap.h @@ -31,8 +31,6 @@ * EASYCAP_DEBUG * EASYCAP_IS_VIDEODEV_CLIENT * EASYCAP_NEEDS_USBVIDEO_H - * EASYCAP_NEEDS_V4L2_DEVICE_H - * EASYCAP_NEEDS_V4L2_FOPS * * IF REQUIRED THEY MUST BE EXTERNALLY DEFINED, FOR EXAMPLE AS COMPILER * OPTIONS. @@ -87,9 +85,7 @@ /*vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv*/ #ifdef EASYCAP_IS_VIDEODEV_CLIENT #include -#ifdef EASYCAP_NEEDS_V4L2_DEVICE_H #include -#endif /*EASYCAP_NEEDS_V4L2_DEVICE_H*/ #endif /*EASYCAP_IS_VIDEODEV_CLIENT*/ /*^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^*/ #include @@ -306,9 +302,7 @@ struct easycap { /*vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv*/ #ifdef EASYCAP_IS_VIDEODEV_CLIENT struct video_device video_device; -#ifdef EASYCAP_NEEDS_V4L2_DEVICE_H struct v4l2_device v4l2_device; -#endif /*EASYCAP_NEEDS_V4L2_DEVICE_H*/ #endif /*EASYCAP_IS_VIDEODEV_CLIENT*/ /*^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^*/ int status; diff --git a/drivers/staging/easycap/easycap_main.c b/drivers/staging/easycap/easycap_main.c index 340d4cff7f8e..fa7982e7a89f 100644 --- a/drivers/staging/easycap/easycap_main.c +++ b/drivers/staging/easycap/easycap_main.c @@ -3132,7 +3132,6 @@ static const struct usb_class_driver easycap_class = { }; /*vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv*/ #ifdef EASYCAP_IS_VIDEODEV_CLIENT -#ifdef EASYCAP_NEEDS_V4L2_FOPS static const struct v4l2_file_operations v4l2_fops = { .owner = THIS_MODULE, .open = easycap_open_noinode, @@ -3141,7 +3140,6 @@ static const struct v4l2_file_operations v4l2_fops = { .poll = easycap_poll, .mmap = easycap_mmap, }; -#endif /*EASYCAP_NEEDS_V4L2_FOPS*/ #endif /*EASYCAP_IS_VIDEODEV_CLIENT*/ /*****************************************************************************/ /*---------------------------------------------------------------------------*/ @@ -3184,9 +3182,7 @@ static int easycap_usb_probe(struct usb_interface *pusb_interface, struct easycap_format *peasycap_format; /*vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv*/ #ifdef EASYCAP_IS_VIDEODEV_CLIENT -#ifdef EASYCAP_NEEDS_V4L2_DEVICE_H struct v4l2_device *pv4l2_device; -#endif /*EASYCAP_NEEDS_V4L2_DEVICE_H*/ #endif /*EASYCAP_IS_VIDEODEV_CLIENT*/ /*^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^*/ @@ -3289,10 +3285,8 @@ static int easycap_usb_probe(struct usb_interface *pusb_interface, #ifdef EASYCAP_IS_VIDEODEV_CLIENT SAM("where 0x%08lX=&peasycap->video_device\n", (unsigned long int) &peasycap->video_device); -#ifdef EASYCAP_NEEDS_V4L2_DEVICE_H SAM("and 0x%08lX=&peasycap->v4l2_device\n", (unsigned long int) &peasycap->v4l2_device); -#endif /*EASYCAP_NEEDS_V4L2_DEVICE_H*/ #endif /*EASYCAP_IS_VIDEODEV_CLIENT*/ /*^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^*/ /*---------------------------------------------------------------------------*/ @@ -3542,11 +3536,7 @@ static int easycap_usb_probe(struct usb_interface *pusb_interface, bInterfaceNumber); return -ENODEV; } -#ifndef EASYCAP_IS_VIDEODEV_CLIENT -# -/*vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv*/ -#else -#ifdef EASYCAP_NEEDS_V4L2_DEVICE_H +#ifdef EASYCAP_IS_VIDEODEV_CLIENT /*---------------------------------------------------------------------------*/ /* * SOME VERSIONS OF THE videodev MODULE OVERWRITE THE DATA WHICH HAS @@ -3564,7 +3554,6 @@ static int easycap_usb_probe(struct usb_interface *pusb_interface, peasycap = (struct easycap *) container_of(pv4l2_device, struct easycap, v4l2_device); } -#endif /*EASYCAP_NEEDS_V4L2_DEVICE_H*/ #endif /*EASYCAP_IS_VIDEODEV_CLIENT*/ } /*---------------------------------------------------------------------------*/ @@ -4136,7 +4125,6 @@ static int easycap_usb_probe(struct usb_interface *pusb_interface, } /*vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv*/ #else -#ifdef EASYCAP_NEEDS_V4L2_DEVICE_H if (0 != (v4l2_device_register(&(pusb_interface->dev), &(peasycap->v4l2_device)))) { SAM("v4l2_device_register() failed\n"); @@ -4156,14 +4144,9 @@ static int easycap_usb_probe(struct usb_interface *pusb_interface, peasycap->video_device.v4l2_dev = NULL; /*---------------------------------------------------------------------------*/ -#endif /*EASYCAP_NEEDS_V4L2_DEVICE_H*/ strcpy(&peasycap->video_device.name[0], "easycapdc60"); -#ifdef EASYCAP_NEEDS_V4L2_FOPS peasycap->video_device.fops = &v4l2_fops; -#else - peasycap->video_device.fops = &easycap_fops; -#endif /*EASYCAP_NEEDS_V4L2_FOPS*/ peasycap->video_device.minor = -1; peasycap->video_device.release = (void *)(&videodev_release); @@ -4539,9 +4522,7 @@ static void easycap_usb_disconnect(struct usb_interface *pusb_interface) int minor, m, kd; /*vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv*/ #ifdef EASYCAP_IS_VIDEODEV_CLIENT -#ifdef EASYCAP_NEEDS_V4L2_DEVICE_H struct v4l2_device *pv4l2_device; -#endif /*EASYCAP_NEEDS_V4L2_DEVICE_H*/ #endif /*EASYCAP_IS_VIDEODEV_CLIENT*/ /*^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^*/ @@ -4571,7 +4552,6 @@ static void easycap_usb_disconnect(struct usb_interface *pusb_interface) } /*---------------------------------------------------------------------------*/ #ifdef EASYCAP_IS_VIDEODEV_CLIENT -#ifdef EASYCAP_NEEDS_V4L2_DEVICE_H /*---------------------------------------------------------------------------*/ /* * SOME VERSIONS OF THE videodev MODULE OVERWRITE THE DATA WHICH HAS @@ -4589,8 +4569,6 @@ static void easycap_usb_disconnect(struct usb_interface *pusb_interface) peasycap = (struct easycap *) container_of(pv4l2_device, struct easycap, v4l2_device); } -#endif /*EASYCAP_NEEDS_V4L2_DEVICE_H*/ -# #endif /*EASYCAP_IS_VIDEODEV_CLIENT*/ /*^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^*/ /*---------------------------------------------------------------------------*/ @@ -4689,7 +4667,6 @@ case 0: { } /*vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv*/ #else -#ifdef EASYCAP_NEEDS_V4L2_DEVICE_H if (!peasycap->v4l2_device.name[0]) { SAM("ERROR: peasycap->v4l2_device.name is empty\n"); if (0 <= kd && DONGLE_MANY > kd) @@ -4700,7 +4677,6 @@ case 0: { JOM(4, "v4l2_device_disconnect() OK\n"); v4l2_device_unregister(&peasycap->v4l2_device); JOM(4, "v4l2_device_unregister() OK\n"); -#endif /*EASYCAP_NEEDS_V4L2_DEVICE_H*/ video_unregister_device(&peasycap->video_device); JOM(4, "intf[%i]: video_unregister_device() OK\n", bInterfaceNumber); diff --git a/drivers/staging/easycap/easycap_sound_oss.c b/drivers/staging/easycap/easycap_sound_oss.c index 0b6065de9656..b18cd351837c 100644 --- a/drivers/staging/easycap/easycap_sound_oss.c +++ b/drivers/staging/easycap/easycap_sound_oss.c @@ -308,9 +308,7 @@ struct easycap *peasycap; int subminor; /*vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv*/ #ifdef EASYCAP_IS_VIDEODEV_CLIENT -#ifdef EASYCAP_NEEDS_V4L2_DEVICE_H struct v4l2_device *pv4l2_device; -#endif /*EASYCAP_NEEDS_V4L2_DEVICE_H*/ #endif /*EASYCAP_IS_VIDEODEV_CLIENT*/ /*^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^*/ @@ -331,11 +329,7 @@ if (NULL == peasycap) { return -1; } /*---------------------------------------------------------------------------*/ -#ifndef EASYCAP_IS_VIDEODEV_CLIENT -# -/*vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv*/ -#else -#ifdef EASYCAP_NEEDS_V4L2_DEVICE_H +#ifdef EASYCAP_IS_VIDEODEV_CLIENT /*---------------------------------------------------------------------------*/ /* * SOME VERSIONS OF THE videodev MODULE OVERWRITE THE DATA WHICH HAS @@ -353,8 +347,6 @@ if (memcmp(&peasycap->telltale[0], TELLTALE, strlen(TELLTALE))) { peasycap = (struct easycap *) container_of(pv4l2_device, struct easycap, v4l2_device); } -#endif /*EASYCAP_NEEDS_V4L2_DEVICE_H*/ -# #endif /*EASYCAP_IS_VIDEODEV_CLIENT*/ /*^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^*/ /*---------------------------------------------------------------------------*/