[GIT,PULL,FOR,v6.1] zoran: move from staging to mainline

Pull-request

git://linuxtv.org/hverkuil/media_tree.git tags/br-v6.1e

Message

Hans Verkuil Aug. 24, 2022, 10:01 a.m. UTC

After a bit of cleanup the zoran driver is now ready to be moved back to
mainline.

Regards,

	Hans

The following changes since commit 1ff8334f0a4e0be693066aafba195d25629d77aa:

  media: MAINTAINERS: add entry for i.MX8MP DW100 v4l2 mem2mem driver (2022-08-21 08:42:26 +0200)

are available in the Git repository at:

  git://linuxtv.org/hverkuil/media_tree.git tags/br-v6.1e

for you to fetch changes up to 9bceea66308c99f2a2c532e4411c1bad0d7d44ea:

  zoran: move to mainline (2022-08-24 11:49:27 +0200)

----------------------------------------------------------------
Tag branch

----------------------------------------------------------------
Hans Verkuil (4):
      zoran: fix checkpatch --strict issues
      zoran: the video device is video capture only, not M2M
      zoran: from VB2_READ/WRITE: read/write isn't supported
      zoran: move to mainline

 drivers/media/pci/Kconfig                                 |   1 +
 drivers/media/pci/Makefile                                |   1 +
 drivers/{staging/media => media/pci}/zoran/Kconfig        |   0
 drivers/{staging/media => media/pci}/zoran/Makefile       |   0
 drivers/{staging/media => media/pci}/zoran/videocodec.c   |   7 +-
 drivers/{staging/media => media/pci}/zoran/videocodec.h   | 190 ++++++++++++++++++++++++++---------------------------
 drivers/{staging/media => media/pci}/zoran/zoran.h        |  30 +++++----
 drivers/{staging/media => media/pci}/zoran/zoran_card.c   |  56 ++++++++--------
 drivers/{staging/media => media/pci}/zoran/zoran_card.h   |   9 ++-
 drivers/{staging/media => media/pci}/zoran/zoran_device.c |  37 ++++++-----
 drivers/media/pci/zoran/zoran_device.h                    |  60 +++++++++++++++++
 drivers/{staging/media => media/pci}/zoran/zoran_driver.c |  59 ++---------------
 drivers/{staging/media => media/pci}/zoran/zr36016.c      | 142 +++++++++++++++++----------------------
 drivers/{staging/media => media/pci}/zoran/zr36016.h      |   0
 drivers/{staging/media => media/pci}/zoran/zr36050.c      | 182 ++++++++++++++++++++++++--------------------------
 drivers/{staging/media => media/pci}/zoran/zr36050.h      |   0
 drivers/{staging/media => media/pci}/zoran/zr36057.h      | 130 ++++++++++++++++++------------------
 drivers/{staging/media => media/pci}/zoran/zr36060.c      |   7 +-
 drivers/{staging/media => media/pci}/zoran/zr36060.h      |  86 ++++++++++++------------
 drivers/staging/media/Kconfig                             |   2 -
 drivers/staging/media/Makefile                            |   1 -
 drivers/staging/media/zoran/TODO                          |  19 ------
 drivers/staging/media/zoran/zoran_device.h                |  60 -----------------
 23 files changed, 491 insertions(+), 588 deletions(-)
 rename drivers/{staging/media => media/pci}/zoran/Kconfig (100%)
 rename drivers/{staging/media => media/pci}/zoran/Makefile (100%)
 rename drivers/{staging/media => media/pci}/zoran/videocodec.c (97%)
 rename drivers/{staging/media => media/pci}/zoran/videocodec.h (65%)
 rename drivers/{staging/media => media/pci}/zoran/zoran.h (90%)
 rename drivers/{staging/media => media/pci}/zoran/zoran_card.c (97%)
 rename drivers/{staging/media => media/pci}/zoran/zoran_card.h (72%)
 rename drivers/{staging/media => media/pci}/zoran/zoran_device.c (96%)
 create mode 100644 drivers/media/pci/zoran/zoran_device.h
 rename drivers/{staging/media => media/pci}/zoran/zoran_driver.c (94%)
 rename drivers/{staging/media => media/pci}/zoran/zr36016.c (73%)
 rename drivers/{staging/media => media/pci}/zoran/zr36016.h (100%)
 rename drivers/{staging/media => media/pci}/zoran/zr36050.c (82%)
 rename drivers/{staging/media => media/pci}/zoran/zr36050.h (100%)
 rename drivers/{staging/media => media/pci}/zoran/zr36057.h (50%)
 rename drivers/{staging/media => media/pci}/zoran/zr36060.c (99%)
 rename drivers/{staging/media => media/pci}/zoran/zr36060.h (72%)
 delete mode 100644 drivers/staging/media/zoran/TODO
 delete mode 100644 drivers/staging/media/zoran/zoran_device.h