Merge tag 'media/v5.1-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media

Pull media updates from Mauro Carvalho Chehab:

 - remove sensor drivers that got converted from soc_camera

 - remaining soc_camera drivers got moved to staging

 - some documentation cleanups and improvements

 - the imx staging driver now supports imx7

 - the ov9640, mt9m001 and mt9m111 got converted from soc_camera

 - the vim2m driver now does what a m2m convert driver expects to do

 - epoll() fixes on media subsystems

 - several drivers fixes, typos, cleanups and improvements

* tag 'media/v5.1-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (346 commits)
  media: dvb/earth-pt1: fix wrong initialization for demod blocks
  media: vim2m: Address some coding style issues
  media: vim2m: don't use BUG()
  media: vim2m: speedup passthrough copy
  media: vim2m: add an horizontal scaler
  media: vim2m: don't accept YUYV anymore as output format
  media: vim2m: add vertical linear scaler
  media: vim2m: better handle cap/out buffers with different sizes
  media: vim2m: use different framesizes for bayer formats
  media: vim2m: add support for VIDIOC_ENUM_FRAMESIZES
  media: vim2m: ensure that width is multiple of two
  media: vim2m: improve debug messages
  media: vim2m: add bayer capture formats
  media: a few more typos at staging, pci, platform, radio and usb
  media: Documentation: fix several typos
  media: staging: fix several typos
  media: include: fix several typos
  media: common: fix several typos
  media: v4l2-core: fix several typos
  media: usb: fix several typos
  ...
This commit is contained in:
Linus Torvalds
2019-03-09 14:45:54 -08:00
536 changed files with 15297 additions and 15373 deletions

View File

@@ -0,0 +1,65 @@
/* SPDX-License-Identifier: GPL-2.0 */
#if !defined(_TRACE_PWC_H) || defined(TRACE_HEADER_MULTI_READ)
#define _TRACE_PWC_H
#include <linux/usb.h>
#include <linux/tracepoint.h>
#undef TRACE_SYSTEM
#define TRACE_SYSTEM pwc
TRACE_EVENT(pwc_handler_enter,
TP_PROTO(struct urb *urb, struct pwc_device *pdev),
TP_ARGS(urb, pdev),
TP_STRUCT__entry(
__field(struct urb*, urb)
__field(struct pwc_frame_buf*, fbuf)
__field(int, urb__status)
__field(u32, urb__actual_length)
__field(int, fbuf__filled)
__string(name, pdev->v4l2_dev.name)
),
TP_fast_assign(
__entry->urb = urb;
__entry->fbuf = pdev->fill_buf;
__entry->urb__status = urb->status;
__entry->urb__actual_length = urb->actual_length;
__entry->fbuf__filled = (pdev->fill_buf
? pdev->fill_buf->filled : 0);
__assign_str(name, pdev->v4l2_dev.name);
),
TP_printk("dev=%s (fbuf=%p filled=%d) urb=%p (status=%d actual_length=%u)",
__get_str(name),
__entry->fbuf,
__entry->fbuf__filled,
__entry->urb,
__entry->urb__status,
__entry->urb__actual_length)
);
TRACE_EVENT(pwc_handler_exit,
TP_PROTO(struct urb *urb, struct pwc_device *pdev),
TP_ARGS(urb, pdev),
TP_STRUCT__entry(
__field(struct urb*, urb)
__field(struct pwc_frame_buf*, fbuf)
__field(int, fbuf__filled)
__string(name, pdev->v4l2_dev.name)
),
TP_fast_assign(
__entry->urb = urb;
__entry->fbuf = pdev->fill_buf;
__entry->fbuf__filled = pdev->fill_buf->filled;
__assign_str(name, pdev->v4l2_dev.name);
),
TP_printk(" dev=%s (fbuf=%p filled=%d) urb=%p",
__get_str(name),
__entry->fbuf,
__entry->fbuf__filled,
__entry->urb)
);
#endif /* _TRACE_PWC_H */
/* This part must be outside protection */
#include <trace/define_trace.h>