Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media

Pull media updates from Mauro Carvalho Chehab:
 "The first part of the media updates for Kernel 3.7.

  This series contain:

   - A major tree renaming patch series: now, drivers are organized
     internally by their used bus, instead of by V4L2 and/or DVB API,
     providing a cleaner driver location for hybrid drivers that
     implement both APIs, and allowing to cleanup the Kconfig items and
     make them more intuitive for the end user;

   - Media Kernel developers are typically very lazy with their duties
     of keeping the MAINTAINERS entries for their drivers updated.  As
     now the tree is more organized, we're doing an effort to add/update
     those entries for the drivers that aren't currently orphan;

   - Several DVB USB drivers got moved to a new DVB USB v2 core; the new
     core fixes several bugs (as the existing one that got bitroted).
     Now, suspend/resume finally started to work fine (at least with
     some devices - we should expect more work with regards to it);

   - added multistream support for DVB-T2, and unified the API for
     DVB-S2 and ISDB-S.  Backward binary support is preserved;

   - as usual, a few new drivers, some V4L2 core improvements and lots
     of drivers improvements and fixes.

  There are some points to notice on this series:

   1) you should expect a trivial merge conflict on your tree, with the
      removal of Documentation/feature-removal-schedule.txt: this series
      would be adding two additional entries there.  I opted to not
      rebase it due to this recent change;

   2) With regards to the PCTV 520e udev-related breakage, I opted to
      fix it in a way that the patches can be backported to 3.5 even
      without your firmware fix patch.  This way, Greg doesn't need to
      rush backporting your patch (as there are still the firmware cache
      and firmware path customization issues to be addressed there).

      I'll send later a patch (likely after the end of the merge window)
      reverting the rest of the DRX-K async firmware request, fully
      restoring its original behaviour to allow media drivers to
      initialize everything serialized as before for 3.7 and upper.

   3) I'm planning to work on this weekend to test the DMABUF patches
      for V4L2.  The patches are on my queue for several Kernel cycles,
      but, up to now, there is/was no way to test the series locally.

      I have some concerns about this particular changeset with regards
      to security issues, and with regards to the replacement of the old
      VIDIOC_OVERLAY ioctl's that is broken on modern systems, due to
      GPU drivers change.  The Overlay API allows direct PCI2PCI
      transfers from a media capture card into the GPU framebuffer, but
      its API is crappy.  Also, the only existing X11 driver that
      implements it requires a XV extension that is not available
      anymore on modern drivers.  The DMABUF can do the same thing, but
      with it is promising to be a properly-designed API.  If I can
      successfully test this series and be happy with it, I should be
      asking you to pull them next week."

* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (717 commits)
  em28xx: regression fix: use DRX-K sync firmware requests on em28xx
  drxk: allow loading firmware synchrousnously
  em28xx: Make all em28xx extensions to be initialized asynchronously
  [media] tda18271: properly report read errors in tda18271_get_id
  [media] tda18271: delay IR & RF calibration until init() if delay_cal is set
  [media] MAINTAINERS: add Michael Krufky as tda827x maintainer
  [media] MAINTAINERS: add Michael Krufky as tda8290 maintainer
  [media] MAINTAINERS: add Michael Krufky as cxusb maintainer
  [media] MAINTAINERS: add Michael Krufky as lg2160 maintainer
  [media] MAINTAINERS: add Michael Krufky as lgdt3305 maintainer
  [media] MAINTAINERS: add Michael Krufky as mxl111sf maintainer
  [media] MAINTAINERS: add Michael Krufky as mxl5007t maintainer
  [media] MAINTAINERS: add Michael Krufky as tda18271 maintainer
  [media] s5p-tv: Report only multi-plane capabilities in vidioc_querycap
  [media] s5p-mfc: Fix misplaced return statement in s5p_mfc_suspend()
  [media] exynos-gsc: Add missing static storage class specifiers
  [media] exynos-gsc: Remove <linux/version.h> header file inclusion
  [media] s5p-fimc: Fix incorrect condition in fimc_lite_reqbufs()
  [media] s5p-tv: Fix potential NULL pointer dereference error
  [media] s5k6aa: Fix possible NULL pointer dereference
  ...

1 files changed, 0 insertions, 306 deletions

diff --git a/drivers/media/video/gspca/finepix.c b/drivers/media/video/gspca/finepix.c
deleted file mode 100644
index c8f2201cc35a..000000000000
--- a/drivers/media/video/gspca/finepix.c
+++ /dev/null
@@ -1,306 +0,0 @@
-/*
- * Fujifilm Finepix subdriver
- *
- * Copyright (C) 2008 Frank Zago
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
-
-#define MODULE_NAME "finepix"
-
-#include "gspca.h"
-
-MODULE_AUTHOR("Frank Zago <frank@zago.net>");
-MODULE_DESCRIPTION("Fujifilm FinePix USB V4L2 driver");
-MODULE_LICENSE("GPL");
-
-/* Default timeout, in ms */
-#define FPIX_TIMEOUT 250
-
-/* Maximum transfer size to use. The windows driver reads by chunks of
- * 0x2000 bytes, so do the same. Note: reading more seems to work
- * too. */
-#define FPIX_MAX_TRANSFER 0x2000
-
-/* Structure to hold all of our device specific stuff */
-struct usb_fpix {
-	struct gspca_dev gspca_dev;	/* !! must be the first item */
-
-	struct work_struct work_struct;
-	struct workqueue_struct *work_thread;
-};
-
-/* Delay after which claim the next frame. If the delay is too small,
- * the camera will return old frames. On the 4800Z, 20ms is bad, 25ms
- * will fail every 4 or 5 frames, but 30ms is perfect. On the A210,
- * 30ms is bad while 35ms is perfect. */
-#define NEXT_FRAME_DELAY 35
-
-/* These cameras only support 320x200. */
-static const struct v4l2_pix_format fpix_mode[1] = {
-	{ 320, 240, V4L2_PIX_FMT_JPEG, V4L2_FIELD_NONE,
-		.bytesperline = 320,
-		.sizeimage = 320 * 240 * 3 / 8 + 590,
-		.colorspace = V4L2_COLORSPACE_SRGB,
-		.priv = 0}
-};
-
-/* send a command to the webcam */
-static int command(struct gspca_dev *gspca_dev,
-		int order)	/* 0: reset, 1: frame request */
-{
-	static u8 order_values[2][12] = {
-		{0xc6, 0, 0, 0, 0, 0, 0,    0, 0x20, 0, 0, 0},	/* reset */
-		{0xd3, 0, 0, 0, 0, 0, 0, 0x01,    0, 0, 0, 0},	/* fr req */
-	};
-
-	memcpy(gspca_dev->usb_buf, order_values[order], 12);
-	return usb_control_msg(gspca_dev->dev,
-			usb_sndctrlpipe(gspca_dev->dev, 0),
-			USB_REQ_GET_STATUS,
-			USB_DIR_OUT | USB_TYPE_CLASS |
-			USB_RECIP_INTERFACE, 0, 0, gspca_dev->usb_buf,
-			12, FPIX_TIMEOUT);
-}
-
-/* workqueue */
-static void dostream(struct work_struct *work)
-{
-	struct usb_fpix *dev = container_of(work, struct usb_fpix, work_struct);
-	struct gspca_dev *gspca_dev = &dev->gspca_dev;
-	struct urb *urb = gspca_dev->urb[0];
-	u8 *data = urb->transfer_buffer;
-	int ret = 0;
-	int len;
-
-	/* synchronize with the main driver */
-	mutex_lock(&gspca_dev->usb_lock);
-	mutex_unlock(&gspca_dev->usb_lock);
-	PDEBUG(D_STREAM, "dostream started");
-
-	/* loop reading a frame */
-again:
-	while (gspca_dev->dev && gspca_dev->streaming) {
-#ifdef CONFIG_PM
-		if (gspca_dev->frozen)
-			break;
-#endif
-
-		/* request a frame */
-		mutex_lock(&gspca_dev->usb_lock);
-		ret = command(gspca_dev, 1);
-		mutex_unlock(&gspca_dev->usb_lock);
-		if (ret < 0)
-			break;
-#ifdef CONFIG_PM
-		if (gspca_dev->frozen)
-			break;
-#endif
-		if (!gspca_dev->dev || !gspca_dev->streaming)
-			break;
-
-		/* the frame comes in parts */
-		for (;;) {
-			ret = usb_bulk_msg(gspca_dev->dev,
-					urb->pipe,
-					data,
-					FPIX_MAX_TRANSFER,
-					&len, FPIX_TIMEOUT);
-			if (ret < 0) {
-				/* Most of the time we get a timeout
-				 * error. Just restart. */
-				goto again;
-			}
-#ifdef CONFIG_PM
-			if (gspca_dev->frozen)
-				goto out;
-#endif
-			if (!gspca_dev->dev || !gspca_dev->streaming)
-				goto out;
-			if (len < FPIX_MAX_TRANSFER ||
-				(data[len - 2] == 0xff &&
-					data[len - 1] == 0xd9)) {
-
-				/* If the result is less than what was asked
-				 * for, then it's the end of the
-				 * frame. Sometimes the jpeg is not complete,
-				 * but there's nothing we can do. We also end
-				 * here if the the jpeg ends right at the end
-				 * of the frame. */
-				gspca_frame_add(gspca_dev, LAST_PACKET,
-						data, len);
-				break;
-			}
-
-			/* got a partial image */
-			gspca_frame_add(gspca_dev,
-					gspca_dev->last_packet_type
-						== LAST_PACKET
-					? FIRST_PACKET : INTER_PACKET,
-					data, len);
-		}
-
-		/* We must wait before trying reading the next
-		 * frame. If we don't, or if the delay is too short,
-		 * the camera will disconnect. */
-		msleep(NEXT_FRAME_DELAY);
-	}
-
-out:
-	PDEBUG(D_STREAM, "dostream stopped");
-}
-
-/* this function is called at probe time */
-static int sd_config(struct gspca_dev *gspca_dev,
-		const struct usb_device_id *id)
-{
-	struct usb_fpix *dev = (struct usb_fpix *) gspca_dev;
-	struct cam *cam = &gspca_dev->cam;
-
-	cam->cam_mode = fpix_mode;
-	cam->nmodes = 1;
-	cam->bulk = 1;
-	cam->bulk_size = FPIX_MAX_TRANSFER;
-
-	INIT_WORK(&dev->work_struct, dostream);
-
-	return 0;
-}
-
-/* this function is called at probe and resume time */
-static int sd_init(struct gspca_dev *gspca_dev)
-{
-	return 0;
-}
-
-/* start the camera */
-static int sd_start(struct gspca_dev *gspca_dev)
-{
-	struct usb_fpix *dev = (struct usb_fpix *) gspca_dev;
-	int ret, len;
-
-	/* Init the device */
-	ret = command(gspca_dev, 0);
-	if (ret < 0) {
-		pr_err("init failed %d\n", ret);
-		return ret;
-	}
-
-	/* Read the result of the command. Ignore the result, for it
-	 * varies with the device. */
-	ret = usb_bulk_msg(gspca_dev->dev,
-			gspca_dev->urb[0]->pipe,
-			gspca_dev->urb[0]->transfer_buffer,
-			FPIX_MAX_TRANSFER, &len,
-			FPIX_TIMEOUT);
-	if (ret < 0) {
-		pr_err("usb_bulk_msg failed %d\n", ret);
-		return ret;
-	}
-
-	/* Request a frame, but don't read it */
-	ret = command(gspca_dev, 1);
-	if (ret < 0) {
-		pr_err("frame request failed %d\n", ret);
-		return ret;
-	}
-
-	/* Again, reset bulk in endpoint */
-	usb_clear_halt(gspca_dev->dev, gspca_dev->urb[0]->pipe);
-
-	/* Start the workqueue function to do the streaming */
-	dev->work_thread = create_singlethread_workqueue(MODULE_NAME);
-	queue_work(dev->work_thread, &dev->work_struct);
-
-	return 0;
-}
-
-/* called on streamoff with alt==0 and on disconnect */
-/* the usb_lock is held at entry - restore on exit */
-static void sd_stop0(struct gspca_dev *gspca_dev)
-{
-	struct usb_fpix *dev = (struct usb_fpix *) gspca_dev;
-
-	/* wait for the work queue to terminate */
-	mutex_unlock(&gspca_dev->usb_lock);
-	destroy_workqueue(dev->work_thread);
-	mutex_lock(&gspca_dev->usb_lock);
-	dev->work_thread = NULL;
-}
-
-/* Table of supported USB devices */
-static const struct usb_device_id device_table[] = {
-	{USB_DEVICE(0x04cb, 0x0104)},
-	{USB_DEVICE(0x04cb, 0x0109)},
-	{USB_DEVICE(0x04cb, 0x010b)},
-	{USB_DEVICE(0x04cb, 0x010f)},
-	{USB_DEVICE(0x04cb, 0x0111)},
-	{USB_DEVICE(0x04cb, 0x0113)},
-	{USB_DEVICE(0x04cb, 0x0115)},
-	{USB_DEVICE(0x04cb, 0x0117)},
-	{USB_DEVICE(0x04cb, 0x0119)},
-	{USB_DEVICE(0x04cb, 0x011b)},
-	{USB_DEVICE(0x04cb, 0x011d)},
-	{USB_DEVICE(0x04cb, 0x0121)},
-	{USB_DEVICE(0x04cb, 0x0123)},
-	{USB_DEVICE(0x04cb, 0x0125)},
-	{USB_DEVICE(0x04cb, 0x0127)},
-	{USB_DEVICE(0x04cb, 0x0129)},
-	{USB_DEVICE(0x04cb, 0x012b)},
-	{USB_DEVICE(0x04cb, 0x012d)},
-	{USB_DEVICE(0x04cb, 0x012f)},
-	{USB_DEVICE(0x04cb, 0x0131)},
-	{USB_DEVICE(0x04cb, 0x013b)},
-	{USB_DEVICE(0x04cb, 0x013d)},
-	{USB_DEVICE(0x04cb, 0x013f)},
-	{}
-};
-
-MODULE_DEVICE_TABLE(usb, device_table);
-
-/* sub-driver description */
-static const struct sd_desc sd_desc = {
-	.name   = MODULE_NAME,
-	.config = sd_config,
-	.init   = sd_init,
-	.start  = sd_start,
-	.stop0  = sd_stop0,
-};
-
-/* -- device connect -- */
-static int sd_probe(struct usb_interface *intf,
-		const struct usb_device_id *id)
-{
-	return gspca_dev_probe(intf, id,
-			&sd_desc,
-			sizeof(struct usb_fpix),
-			THIS_MODULE);
-}
-
-static struct usb_driver sd_driver = {
-	.name       = MODULE_NAME,
-	.id_table   = device_table,
-	.probe      = sd_probe,
-	.disconnect = gspca_disconnect,
-#ifdef CONFIG_PM
-	.suspend = gspca_suspend,
-	.resume  = gspca_resume,
-	.reset_resume = gspca_resume,
-#endif
-};
-
-module_usb_driver(sd_driver);