]> git.karo-electronics.de Git - linux-beck.git/commitdiff
[media] v4l: tvp5150: Compile tvp5150_link_setup out if !CONFIG_MEDIA_CONTROLLER
authorLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Thu, 8 Dec 2016 22:22:41 +0000 (20:22 -0200)
committerMauro Carvalho Chehab <mchehab@s-opensource.com>
Mon, 12 Dec 2016 09:43:32 +0000 (07:43 -0200)
The function is only referenced as a handler in the tvp5150_sd_media_ops
structure, which is only used when CONFIG_MEDIA_CONTROLLER is set. Don't
define the function and the structure when the configuration option is
unset to avoid an unused function warning.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
drivers/media/i2c/tvp5150.c

index 6737685d5be57ab840d9691953fd993b7ed3188e..08384951c9e5ce107379623ae051faa491e5308a 100644 (file)
@@ -1013,11 +1013,11 @@ static int tvp5150_enum_frame_size(struct v4l2_subdev *sd,
                        Media entity ops
  ****************************************************************************/
 
+#ifdef CONFIG_MEDIA_CONTROLLER
 static int tvp5150_link_setup(struct media_entity *entity,
                              const struct media_pad *local,
                              const struct media_pad *remote, u32 flags)
 {
-#ifdef CONFIG_MEDIA_CONTROLLER
        struct v4l2_subdev *sd = media_entity_to_v4l2_subdev(entity);
        struct tvp5150 *decoder = to_tvp5150(sd);
        int i;
@@ -1034,7 +1034,6 @@ static int tvp5150_link_setup(struct media_entity *entity,
        decoder->input = i;
 
        tvp5150_selmux(sd);
-#endif
 
        return 0;
 }
@@ -1042,6 +1041,7 @@ static int tvp5150_link_setup(struct media_entity *entity,
 static const struct media_entity_operations tvp5150_sd_media_ops = {
        .link_setup = tvp5150_link_setup,
 };
+#endif
 
 /****************************************************************************
                        I2C Command