1 files changed, 3 insertions, 18 deletions

diff --git a/drivers/media/video/tw9910.c b/drivers/media/video/tw9910.c
index 0347bbe36459..742482e30011 100644
--- a/drivers/media/video/tw9910.c
+++ b/drivers/media/video/tw9910.c
@@ -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)
 {
@@ -846,13 +836,9 @@ static int tw9910_video_probe(struct soc_camera_device *icd,
         struct tw9910_priv *priv = to_tw9910(client);
         s32 id;
 
-        /*
-         * We must have a parent by now. And it cannot be a wrong one.
-         * So this entire test is completely redundant.
-         */
-        if (!icd->dev.parent ||
-            to_soc_camera_host(icd->dev.parent)->nr != icd->iface)
-                return -ENODEV;
+        /* We must have a parent by now. And it cannot be a wrong one. */
+        BUG_ON(!icd->parent ||
+               to_soc_camera_host(icd->parent)->nr != icd->iface);
 
         /*
          * tw9910 only use 8 or 16 bit bus width
@@ -891,7 +877,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 = {