[media] rename most media/video pci drivers to media/pci

Rename all PCI drivers with their own directory under
drivers/media/video into drivers/media/pci and update the
building system.

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

1 files changed, 0 insertions, 131 deletions

diff --git a/drivers/media/video/cx18/cx18-controls.c b/drivers/media/video/cx18/cx18-controls.c
deleted file mode 100644
index 282a3d29fdaa..000000000000
--- a/drivers/media/video/cx18/cx18-controls.c
+++ /dev/null
@@ -1,131 +0,0 @@
-/*
- *  cx18 ioctl control functions
- *
- *  Derived from ivtv-controls.c
- *
- *  Copyright (C) 2007  Hans Verkuil <hverkuil@xs4all.nl>
- *
- *  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
- *  (at your option) 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
- */
-#include <linux/kernel.h>
-#include <linux/slab.h>
-
-#include "cx18-driver.h"
-#include "cx18-cards.h"
-#include "cx18-ioctl.h"
-#include "cx18-audio.h"
-#include "cx18-mailbox.h"
-#include "cx18-controls.h"
-
-static int cx18_s_stream_vbi_fmt(struct cx2341x_handler *cxhdl, u32 fmt)
-{
-	struct cx18 *cx = container_of(cxhdl, struct cx18, cxhdl);
-	int type = cxhdl->stream_type->val;
-
-	if (atomic_read(&cx->ana_capturing) > 0)
-		return -EBUSY;
-
-	if (fmt != V4L2_MPEG_STREAM_VBI_FMT_IVTV ||
-	    !(type == V4L2_MPEG_STREAM_TYPE_MPEG2_PS ||
-	      type == V4L2_MPEG_STREAM_TYPE_MPEG2_DVD ||
-	      type == V4L2_MPEG_STREAM_TYPE_MPEG2_SVCD)) {
-		/* Only IVTV fmt VBI insertion & only MPEG-2 PS type streams */
-		cx->vbi.insert_mpeg = V4L2_MPEG_STREAM_VBI_FMT_NONE;
-		CX18_DEBUG_INFO("disabled insertion of sliced VBI data into "
-				"the MPEG stream\n");
-		return 0;
-	}
-
-	/* Allocate sliced VBI buffers if needed. */
-	if (cx->vbi.sliced_mpeg_data[0] == NULL) {
-		int i;
-
-		for (i = 0; i < CX18_VBI_FRAMES; i++) {
-			cx->vbi.sliced_mpeg_data[i] =
-			       kmalloc(CX18_SLICED_MPEG_DATA_BUFSZ, GFP_KERNEL);
-			if (cx->vbi.sliced_mpeg_data[i] == NULL) {
-				while (--i >= 0) {
-					kfree(cx->vbi.sliced_mpeg_data[i]);
-					cx->vbi.sliced_mpeg_data[i] = NULL;
-				}
-				cx->vbi.insert_mpeg =
-						  V4L2_MPEG_STREAM_VBI_FMT_NONE;
-				CX18_WARN("Unable to allocate buffers for "
-					  "sliced VBI data insertion\n");
-				return -ENOMEM;
-			}
-		}
-	}
-
-	cx->vbi.insert_mpeg = fmt;
-	CX18_DEBUG_INFO("enabled insertion of sliced VBI data into the MPEG PS,"
-			"when sliced VBI is enabled\n");
-
-	/*
-	 * If our current settings have no lines set for capture, store a valid,
-	 * default set of service lines to capture, in our current settings.
-	 */
-	if (cx18_get_service_set(cx->vbi.sliced_in) == 0) {
-		if (cx->is_60hz)
-			cx->vbi.sliced_in->service_set =
-							V4L2_SLICED_CAPTION_525;
-		else
-			cx->vbi.sliced_in->service_set = V4L2_SLICED_WSS_625;
-		cx18_expand_service_set(cx->vbi.sliced_in, cx->is_50hz);
-	}
-	return 0;
-}
-
-static int cx18_s_video_encoding(struct cx2341x_handler *cxhdl, u32 val)
-{
-	struct cx18 *cx = container_of(cxhdl, struct cx18, cxhdl);
-	int is_mpeg1 = val == V4L2_MPEG_VIDEO_ENCODING_MPEG_1;
-	struct v4l2_mbus_framefmt fmt;
-
-	/* fix videodecoder resolution */
-	fmt.width = cxhdl->width / (is_mpeg1 ? 2 : 1);
-	fmt.height = cxhdl->height;
-	fmt.code = V4L2_MBUS_FMT_FIXED;
-	v4l2_subdev_call(cx->sd_av, video, s_mbus_fmt, &fmt);
-	return 0;
-}
-
-static int cx18_s_audio_sampling_freq(struct cx2341x_handler *cxhdl, u32 idx)
-{
-	static const u32 freqs[3] = { 44100, 48000, 32000 };
-	struct cx18 *cx = container_of(cxhdl, struct cx18, cxhdl);
-
-	/* The audio clock of the digitizer must match the codec sample
-	   rate otherwise you get some very strange effects. */
-	if (idx < ARRAY_SIZE(freqs))
-		cx18_call_all(cx, audio, s_clock_freq, freqs[idx]);
-	return 0;
-}
-
-static int cx18_s_audio_mode(struct cx2341x_handler *cxhdl, u32 val)
-{
-	struct cx18 *cx = container_of(cxhdl, struct cx18, cxhdl);
-
-	cx->dualwatch_stereo_mode = val;
-	return 0;
-}
-
-struct cx2341x_handler_ops cx18_cxhdl_ops = {
-	.s_audio_mode = cx18_s_audio_mode,
-	.s_audio_sampling_freq = cx18_s_audio_sampling_freq,
-	.s_video_encoding = cx18_s_video_encoding,
-	.s_stream_vbi_fmt = cx18_s_stream_vbi_fmt,
-};