]> Pileus Git - ~andy/linux/commitdiff
[media] V4L: tw9910: remove bogus ENUMINPUT implementation
authorGuennadi Liakhovetski <g.liakhovetski@gmx.de>
Sat, 4 Jun 2011 19:48:10 +0000 (16:48 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Wed, 27 Jul 2011 20:53:22 +0000 (17:53 -0300)
tw9910 is a TV decoder, it doesn't have a tuner. Besides, the
.enum_input soc-camera operation is optional and normally not needed.

Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
drivers/media/video/tw9910.c

index 0347bbe364593e7683ad16289a3c3a29362efa2e..a722f66c3f23772a164b479e6620fe1619ce09d4 100644 (file)
@@ -552,16 +552,6 @@ static int tw9910_s_std(struct v4l2_subdev *sd, v4l2_std_id norm)
        return ret;
 }
 
-static int tw9910_enum_input(struct soc_camera_device *icd,
-                            struct v4l2_input *inp)
-{
-       inp->type = V4L2_INPUT_TYPE_TUNER;
-       inp->std  = V4L2_STD_UNKNOWN;
-       strcpy(inp->name, "Video");
-
-       return 0;
-}
-
 static int tw9910_g_chip_ident(struct v4l2_subdev *sd,
                               struct v4l2_dbg_chip_ident *id)
 {
@@ -891,7 +881,6 @@ static int tw9910_video_probe(struct soc_camera_device *icd,
 static struct soc_camera_ops tw9910_ops = {
        .set_bus_param          = tw9910_set_bus_param,
        .query_bus_param        = tw9910_query_bus_param,
-       .enum_input             = tw9910_enum_input,
 };
 
 static struct v4l2_subdev_core_ops tw9910_subdev_core_ops = {