[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, 119 deletions

diff --git a/drivers/media/video/ivtv/ivtv-routing.c b/drivers/media/video/ivtv/ivtv-routing.c
deleted file mode 100644
index 8898c569a1c9..000000000000
--- a/drivers/media/video/ivtv/ivtv-routing.c
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
-    Audio/video-routing-related ivtv functions.
-    Copyright (C) 2003-2004  Kevin Thayer <nufan_wfk at yahoo.com>
-    Copyright (C) 2005-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 "ivtv-driver.h"
-#include "ivtv-i2c.h"
-#include "ivtv-cards.h"
-#include "ivtv-gpio.h"
-#include "ivtv-routing.h"
-
-#include <media/msp3400.h>
-#include <media/m52790.h>
-#include <media/upd64031a.h>
-#include <media/upd64083.h>
-
-/* Selects the audio input and output according to the current
-   settings. */
-void ivtv_audio_set_io(struct ivtv *itv)
-{
-	const struct ivtv_card_audio_input *in;
-	u32 input, output = 0;
-
-	/* Determine which input to use */
-	if (test_bit(IVTV_F_I_RADIO_USER, &itv->i_flags))
-		in = &itv->card->radio_input;
-	else
-		in = &itv->card->audio_inputs[itv->audio_input];
-
-	/* handle muxer chips */
-	input = in->muxer_input;
-	if (itv->card->hw_muxer & IVTV_HW_M52790)
-		output = M52790_OUT_STEREO;
-	v4l2_subdev_call(itv->sd_muxer, audio, s_routing,
-			input, output, 0);
-
-	input = in->audio_input;
-	output = 0;
-	if (itv->card->hw_audio & IVTV_HW_MSP34XX)
-		output = MSP_OUTPUT(MSP_SC_IN_DSP_SCART1);
-	ivtv_call_hw(itv, itv->card->hw_audio, audio, s_routing,
-			input, output, 0);
-}
-
-/* Selects the video input and output according to the current
-   settings. */
-void ivtv_video_set_io(struct ivtv *itv)
-{
-	int inp = itv->active_input;
-	u32 input;
-	u32 type;
-
-	v4l2_subdev_call(itv->sd_video, video, s_routing,
-		itv->card->video_inputs[inp].video_input, 0, 0);
-
-	type = itv->card->video_inputs[inp].video_type;
-
-	if (type == IVTV_CARD_INPUT_VID_TUNER) {
-		input = 0;  /* Tuner */
-	} else if (type < IVTV_CARD_INPUT_COMPOSITE1) {
-		input = 2;  /* S-Video */
-	} else {
-		input = 1;  /* Composite */
-	}
-
-	if (itv->card->hw_video & IVTV_HW_GPIO)
-		ivtv_call_hw(itv, IVTV_HW_GPIO, video, s_routing,
-				input, 0, 0);
-
-	if (itv->card->hw_video & IVTV_HW_UPD64031A) {
-		if (type == IVTV_CARD_INPUT_VID_TUNER ||
-		    type >= IVTV_CARD_INPUT_COMPOSITE1) {
-			/* Composite: GR on, connect to 3DYCS */
-			input = UPD64031A_GR_ON | UPD64031A_3DYCS_COMPOSITE;
-		} else {
-			/* S-Video: GR bypassed, turn it off */
-			input = UPD64031A_GR_OFF | UPD64031A_3DYCS_DISABLE;
-		}
-		input |= itv->card->gr_config;
-
-		ivtv_call_hw(itv, IVTV_HW_UPD64031A, video, s_routing,
-				input, 0, 0);
-	}
-
-	if (itv->card->hw_video & IVTV_HW_UPD6408X) {
-		input = UPD64083_YCS_MODE;
-		if (type > IVTV_CARD_INPUT_VID_TUNER &&
-		    type < IVTV_CARD_INPUT_COMPOSITE1) {
-			/* S-Video uses YCNR mode and internal Y-ADC, the
-			   upd64031a is not used. */
-			input |= UPD64083_YCNR_MODE;
-		}
-		else if (itv->card->hw_video & IVTV_HW_UPD64031A) {
-			/* Use upd64031a output for tuner and
-			   composite(CX23416GYC only) inputs */
-			if (type == IVTV_CARD_INPUT_VID_TUNER ||
-			    itv->card->type == IVTV_CARD_CX23416GYC) {
-				input |= UPD64083_EXT_Y_ADC;
-			}
-		}
-		ivtv_call_hw(itv, IVTV_HW_UPD6408X, video, s_routing,
-				input, 0, 0);
-	}
-}