Hello, On Monday 11 August 2014 09:20:47 Felipe Balbi wrote: > On Mon, Aug 11, 2014 at 03:50:08PM +0200, Michael Grzeschik wrote: > > > > As the driver is mainline we can remove the version numbers. > > > > > > > > Signed-off-by: Michael Grzeschik <m.grzeschik@xxxxxxxxxxxxxx> > > > > --- > > > > > > > > drivers/usb/gadget/uvc.h | 3 --- > > > > drivers/usb/gadget/uvc_v4l2.c | 1 - > > > > 2 files changed, 4 deletions(-) > > > > > > > > diff --git a/drivers/usb/gadget/uvc.h b/drivers/usb/gadget/uvc.h > > > > index 49d9573..e593a10 100644 > > > > --- a/drivers/usb/gadget/uvc.h > > > > +++ b/drivers/usb/gadget/uvc.h > > > > @@ -96,9 +96,6 @@ extern unsigned int uvc_gadget_trace_param; > > > > > > > > * Driver specific constants > > > > */ > > > > > > > > -#define DRIVER_VERSION "0.1.0" > > > > -#define DRIVER_VERSION_NUMBER KERNEL_VERSION(0, 1, 0) > > > > - > > > > > > > > #define UVC_NUM_REQUESTS 16 > > > > #define UVC_MAX_REQUEST_SIZE 64 > > > > #define UVC_MAX_EVENTS 4 > > > > > > > > diff --git a/drivers/usb/gadget/uvc_v4l2.c > > > > b/drivers/usb/gadget/uvc_v4l2.c > > > > index 58633bf..65af2f8 100644 > > > > --- a/drivers/usb/gadget/uvc_v4l2.c > > > > +++ b/drivers/usb/gadget/uvc_v4l2.c > > > > @@ -194,7 +194,6 @@ uvc_v4l2_do_ioctl(struct file *file, unsigned int > > > > cmd, void *arg)> > > > > > > strlcpy(cap->card, cdev->gadget->name, sizeof(cap->card)); > > > > strlcpy(cap->bus_info, dev_name(&cdev->gadget->dev), > > > > > > > > sizeof cap->bus_info); > > > > > > > > - cap->version = DRIVER_VERSION_NUMBER; > > > > > > did you run v4l2-compliance ? IIRC it will fail if you don't provide > > > cap->version. > > > > True! > > > > Is it right to change it to LINUX_VERSION_CODE as v4l_querycap? > > I was unsure as checkpatch was barfing about using this. > > I'd ask Laurent :-) Laurent, any hints ? Yes, that's the right short-term fix. A better fix would be to convert the driver to use video_ioctl2, which I'm doing right now. I'll send patches shortly. In the meantime, setting the version field to LINUX_VERSION_CODE is fine. Michael, could you please update your patch ? -- Regards, Laurent Pinchart
Attachment:
signature.asc
Description: This is a digitally signed message part.
