Corentin Labbe did the hard work of converting the zoran driver to vb2. The only things left to do in order to move it back to mainline is to fix the remaining checkpatch issues, fix two minor left-overs from the time that video output was supported and finally move it back to drivers/media/pci. Regards, Hans 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 + .../media => media/pci}/zoran/Kconfig | 0 .../media => media/pci}/zoran/Makefile | 0 .../media => media/pci}/zoran/videocodec.c | 7 +- .../media => media/pci}/zoran/videocodec.h | 190 +++++++++--------- .../media => media/pci}/zoran/zoran.h | 30 ++- .../media => media/pci}/zoran/zoran_card.c | 56 +++--- .../media => media/pci}/zoran/zoran_card.h | 9 +- .../media => media/pci}/zoran/zoran_device.c | 37 ++-- drivers/media/pci/zoran/zoran_device.h | 60 ++++++ .../media => media/pci}/zoran/zoran_driver.c | 59 +----- .../media => media/pci}/zoran/zr36016.c | 142 ++++++------- .../media => media/pci}/zoran/zr36016.h | 0 .../media => media/pci}/zoran/zr36050.c | 182 ++++++++--------- .../media => media/pci}/zoran/zr36050.h | 0 .../media => media/pci}/zoran/zr36057.h | 130 ++++++------ .../media => media/pci}/zoran/zr36060.c | 7 +- .../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 -- 2.35.1