aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Grzeschik <m.grzeschik@pengutronix.de>2014-08-21 10:54:46 -0400
committerFelipe Balbi <balbi@ti.com>2014-08-21 11:03:54 -0400
commit84d1b78af9b35d706de2d1c115b9194bcaaa97b0 (patch)
tree7cdc8d2c284646f95ae9446a906560ca5fd11171
parente73798572e115f73066567f5840d4e5c21da70a8 (diff)
usb: gadget: uvc: remove DRIVER_VERSION{,_NUMBER}
As the driver is in mainline we can remove the version numbers. Signed-off-by: Michael Grzeschik <m.grzeschik@pengutronix.de> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Felipe Balbi <balbi@ti.com>
-rw-r--r--drivers/usb/gadget/function/uvc.h3
-rw-r--r--drivers/usb/gadget/function/uvc_v4l2.c2
2 files changed, 1 insertions, 4 deletions
diff --git a/drivers/usb/gadget/function/uvc.h b/drivers/usb/gadget/function/uvc.h
index 7a9111de8054..0a283b1237d5 100644
--- a/drivers/usb/gadget/function/uvc.h
+++ b/drivers/usb/gadget/function/uvc.h
@@ -96,9 +96,6 @@ extern unsigned int uvc_gadget_trace_param;
96 * Driver specific constants 96 * Driver specific constants
97 */ 97 */
98 98
99#define DRIVER_VERSION "0.1.0"
100#define DRIVER_VERSION_NUMBER KERNEL_VERSION(0, 1, 0)
101
102#define UVC_NUM_REQUESTS 4 99#define UVC_NUM_REQUESTS 4
103#define UVC_MAX_REQUEST_SIZE 64 100#define UVC_MAX_REQUEST_SIZE 64
104#define UVC_MAX_EVENTS 4 101#define UVC_MAX_EVENTS 4
diff --git a/drivers/usb/gadget/function/uvc_v4l2.c b/drivers/usb/gadget/function/uvc_v4l2.c
index ad48e81155e2..bcd71cee7b51 100644
--- a/drivers/usb/gadget/function/uvc_v4l2.c
+++ b/drivers/usb/gadget/function/uvc_v4l2.c
@@ -178,7 +178,7 @@ uvc_v4l2_do_ioctl(struct file *file, unsigned int cmd, void *arg)
178 strlcpy(cap->card, cdev->gadget->name, sizeof(cap->card)); 178 strlcpy(cap->card, cdev->gadget->name, sizeof(cap->card));
179 strlcpy(cap->bus_info, dev_name(&cdev->gadget->dev), 179 strlcpy(cap->bus_info, dev_name(&cdev->gadget->dev),
180 sizeof cap->bus_info); 180 sizeof cap->bus_info);
181 cap->version = DRIVER_VERSION_NUMBER; 181 cap->version = LINUX_VERSION_CODE;
182 cap->capabilities = V4L2_CAP_VIDEO_OUTPUT | V4L2_CAP_STREAMING; 182 cap->capabilities = V4L2_CAP_VIDEO_OUTPUT | V4L2_CAP_STREAMING;
183 break; 183 break;
184 } 184 }