V4L/DVB (3712): Fix video input setting of em28xx, use _INT_S_VIDEO_ROUTING in tvp5150

- Use new routing input defines in em28xx-cards.c
- Fix S-Video settings for tvp5150-based cards (input was copied from saa7115
  based cards and worked only because S-Video was selected in the default: case)
- Replace VIDIOC_S_INPUT by VIDIOC_INT_S_VIDEO_ROUTING in em28xx-video.c
- Remove the now obsolete VIDIOC_S_INPUT handler in saa7115.c
- Add VIDIOC_INT_G/S_VIDEO_ROUTING in tvp5150.c
- Add new media/tvp5150.h with the routing defines.

Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

1 files changed, 0 insertions, 28 deletions

diff --git a/drivers/media/video/saa7115.c b/drivers/media/video/saa7115.c
index edea9e3d2dca..f4843bb45347 100644
--- a/drivers/media/video/saa7115.c
+++ b/drivers/media/video/saa7115.c
@@ -1238,34 +1238,6 @@ static int saa7115_command(struct i2c_client *client, unsigned int cmd, void *ar
                 break;
         }
 
-        case VIDIOC_G_INPUT:
-                *(int *)arg = state->input;
-                break;
-
-        case VIDIOC_S_INPUT:
-                v4l_dbg(1, debug, client, "decoder set input %d\n", *iarg);
-                /* inputs from 0-9 are available */
-                if (*iarg < 0 || *iarg > 9) {
-                        return -EINVAL;
-                }
-
-                if (state->input == *iarg)
-                        break;
-                v4l_dbg(1, debug, client, "now setting %s input\n",
-                        *iarg >= 6 ? "S-Video" : "Composite");
-                state->input = *iarg;
-
-                /* select mode */
-                saa7115_write(client, 0x02,
-                              (saa7115_read(client, 0x02) & 0xf0) |
-                               state->input);
-
-                /* bypass chrominance trap for modes 6..9 */
-                saa7115_write(client, 0x09,
-                              (saa7115_read(client, 0x09) & 0x7f) |
-                               (state->input < 6 ? 0x0 : 0x80));
-                break;
-
         case VIDIOC_STREAMON:
         case VIDIOC_STREAMOFF:
                 v4l_dbg(1, debug, client, "%s output\n",