diff options
| author | Felipe Balbi <felipe.balbi@linux.intel.com> | 2018-10-02 10:26:43 +0300 |
|---|---|---|
| committer | Felipe Balbi <felipe.balbi@linux.intel.com> | 2018-10-02 10:26:43 +0300 |
| commit | 755801cb9feb0571b36b9df5a114f09b2de604aa (patch) | |
| tree | 6b14af96baaf4c50b12cdfb97d0658bb0b342122 /drivers/usb/gadget/function/uvc.h | |
| parent | 17b57b1883c1285f3d0dc2266e8f79286a7bef38 (diff) | |
| parent | 3fb2fd76eda265ce5421318de38dd9b9f7c54737 (diff) | |
| download | linux-755801cb9feb0571b36b9df5a114f09b2de604aa.tar.xz | |
Merge tag 'uvcg-20180925' of git://linuxtv.org/pinchartl/media into testing/next
UVC gadget updates for v4.20
- configfs cleanups, fixes and extensions
- Endianness fixes
- Miscellaneous cleanups
Diffstat (limited to 'drivers/usb/gadget/function/uvc.h')
| -rw-r--r-- | drivers/usb/gadget/function/uvc.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/usb/gadget/function/uvc.h b/drivers/usb/gadget/function/uvc.h index 93cf78b420fe..099d650082e5 100644 --- a/drivers/usb/gadget/function/uvc.h +++ b/drivers/usb/gadget/function/uvc.h @@ -24,6 +24,7 @@ struct usb_ep; struct usb_request; struct uvc_descriptor_header; +struct uvc_device; /* ------------------------------------------------------------------------ * Debugging, printing and logging @@ -51,14 +52,12 @@ extern unsigned int uvc_gadget_trace_param; printk(KERN_DEBUG "uvcvideo: " msg); \ } while (0) -#define uvc_warn_once(dev, warn, msg...) \ - do { \ - if (!test_and_set_bit(warn, &dev->warnings)) \ - printk(KERN_INFO "uvcvideo: " msg); \ - } while (0) - -#define uvc_printk(level, msg...) \ - printk(level "uvcvideo: " msg) +#define uvcg_dbg(f, fmt, args...) \ + dev_dbg(&(f)->config->cdev->gadget->dev, "%s: " fmt, (f)->name, ##args) +#define uvcg_info(f, fmt, args...) \ + dev_info(&(f)->config->cdev->gadget->dev, "%s: " fmt, (f)->name, ##args) +#define uvcg_err(f, fmt, args...) \ + dev_err(&(f)->config->cdev->gadget->dev, "%s: " fmt, (f)->name, ##args) /* ------------------------------------------------------------------------ * Driver specific constants @@ -73,6 +72,7 @@ extern unsigned int uvc_gadget_trace_param; */ struct uvc_video { + struct uvc_device *uvc; struct usb_ep *ep; /* Frame parameters */ |