From c5c412c73d6ef6c1599faecac9a0cefbcb7e9039 Mon Sep 17 00:00:00 2001
From: Hans Verkuil <hverkuil@xs4all.nl>
Date: Mon, 20 Mar 2006 16:32:52 -0300
Subject: [PATCH] --- yaml --- r: 23647 b: refs/heads/master c:
 e3bb83420346534b51a500e3b13f75e269c3dd60 h: refs/heads/master i:   23645:
 ebe3e30a8e7eeb2c5b3b4edf68b8ff74649a705a   23643:
 539055eab035e6c2e48c33ce5b9725187ac73317   23639:
 5f44960db3b35e46bd4bee5d35812b63725c5d1a   23631:
 83d684f89b8f3eeab7a13f8ebc33b57529bab53a   23615:
 8fdc46c7428fa1ae4b3cf4425daa7a9e5e8f89c3 v: v3

---
 [refs]                                     |  2 +-
 trunk/drivers/media/video/msp3400-driver.c | 39 ++--------------------
 2 files changed, 3 insertions(+), 38 deletions(-)

diff --git a/[refs] b/[refs]
index 182af11d6abd..4671aa689b7f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c68735180c6e274d938b8c07d61dcf5077085c7f
+refs/heads/master: e3bb83420346534b51a500e3b13f75e269c3dd60
diff --git a/trunk/drivers/media/video/msp3400-driver.c b/trunk/drivers/media/video/msp3400-driver.c
index fb3d1f41f116..c40e8ba9a2ea 100644
--- a/trunk/drivers/media/video/msp3400-driver.c
+++ b/trunk/drivers/media/video/msp3400-driver.c
@@ -684,7 +684,6 @@ static int msp_command(struct i2c_client *client, unsigned int cmd, void *arg)
 	{
 		struct v4l2_routing *rt = arg;
 		int tuner = (rt->input >> 3) & 1;
-		int old_tuner = (state->routing.input >> 3) & 1;
 		int sc_in = rt->input & 0x7;
 		int sc1_out = rt->output & 0xf;
 		int sc2_out = (rt->output >> 4) & 0xf;
@@ -733,42 +732,6 @@ static int msp_command(struct i2c_client *client, unsigned int cmd, void *arg)
 		break;
 	}
 
-	case VIDIOC_G_AUDOUT:
-	{
-		struct v4l2_audioout *a = (struct v4l2_audioout *)arg;
-		int idx = a->index;
-
-		memset(a, 0, sizeof(*a));
-
-		switch (idx) {
-		case 0:
-			strcpy(a->name, "Scart1 Out");
-			break;
-		case 1:
-			strcpy(a->name, "Scart2 Out");
-			break;
-		case 2:
-			strcpy(a->name, "I2S Out");
-			break;
-		default:
-			return -EINVAL;
-		}
-		break;
-	}
-
-	case VIDIOC_S_AUDOUT:
-	{
-		struct v4l2_audioout *a = (struct v4l2_audioout *)arg;
-
-		if (a->index < 0 || a->index > 2)
-			return -EINVAL;
-
-		v4l_dbg(1, msp_debug, client, "Setting audio out on msp34xx to input %i\n", a->index);
-		msp_set_scart(client, state->in_scart, a->index + 1);
-
-		break;
-	}
-
 	case VIDIOC_INT_I2S_CLOCK_FREQ:
 	{
 		u32 *a = (u32 *)arg;
@@ -854,6 +817,8 @@ static int msp_command(struct i2c_client *client, unsigned int cmd, void *arg)
 				(state->rxsubchans & V4L2_TUNER_SUB_LANG2) ? ", dual" : "");
 		}
 		v4l_info(client, "Audmode:  0x%04x\n", state->audmode);
+		v4l_info(client, "Routing:  0x%08x (input) 0x%08x (output)\n",
+				state->routing.input, state->routing.output);
 		v4l_info(client, "ACB:      0x%04x\n", state->acb);
 		break;
 	}