[media] platform: Make use of media_bus_format enum

[deliverable/linux.git] / drivers / media / platform / vsp1 / vsp1_lif.c

diff --git a/drivers/media/platform/vsp1/vsp1_lif.c b/drivers/media/platform/vsp1/vsp1_lif.c
index 135a78957014d38d52fc4a816611fded79d8e269..17a6ca7dafe6c240c6af50a9ae9c24db8289dc7b 100644 (file)
--- a/drivers/media/platform/vsp1/vsp1_lif.c
+++ b/drivers/media/platform/vsp1/vsp1_lif.c
@@ -78,8 +78,8 @@ static int lif_enum_mbus_code(struct v4l2_subdev *subdev,
                              struct v4l2_subdev_mbus_code_enum *code)
 {
        static const unsigned int codes[] = {
-               V4L2_MBUS_FMT_ARGB8888_1X32,
-               V4L2_MBUS_FMT_AYUV8_1X32,
+               MEDIA_BUS_FMT_ARGB8888_1X32,
+               MEDIA_BUS_FMT_AYUV8_1X32,
        };
 
        if (code->pad == LIF_PAD_SINK) {
@@ -147,9 +147,9 @@ static int lif_set_format(struct v4l2_subdev *subdev, struct v4l2_subdev_fh *fh,
        struct v4l2_mbus_framefmt *format;
 
        /* Default to YUV if the requested format is not supported. */
-       if (fmt->format.code != V4L2_MBUS_FMT_ARGB8888_1X32 &&
-           fmt->format.code != V4L2_MBUS_FMT_AYUV8_1X32)
-               fmt->format.code = V4L2_MBUS_FMT_AYUV8_1X32;
+       if (fmt->format.code != MEDIA_BUS_FMT_ARGB8888_1X32 &&
+           fmt->format.code != MEDIA_BUS_FMT_AYUV8_1X32)
+               fmt->format.code = MEDIA_BUS_FMT_AYUV8_1X32;
 
        format = vsp1_entity_get_pad_format(&lif->entity, fh, fmt->pad,
                                            fmt->which);
@@ -215,7 +215,6 @@ struct vsp1_lif *vsp1_lif_create(struct vsp1_device *vsp1)
                return ERR_PTR(-ENOMEM);
 
        lif->entity.type = VSP1_ENTITY_LIF;
-       lif->entity.id = VI6_DPR_NODE_LIF;
 
        ret = vsp1_entity_init(vsp1, &lif->entity, 2);
        if (ret < 0)