[media] vivid: Don't mess with namespace adding a "get_format" function

This fixes a compilation error with allyesconfig:

drivers/media/platform/exynos-gsc/built-in.o: In function `get_format':
(.text+0x12f5): multiple definition of `get_format'
drivers/media/platform/vivid/built-in.o:(.text+0x4bf4): first defined here

Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>

4 files changed, 12 insertions, 12 deletions

diff --git a/drivers/media/platform/vivid/vivid-vid-cap.c b/drivers/media/platform/vivid/vivid-vid-cap.c
index 52f24ea40af3..115437af1ee0 100644
--- a/drivers/media/platform/vivid/vivid-vid-cap.c
+++ b/drivers/media/platform/vivid/vivid-vid-cap.c
@@ -130,7 +130,7 @@ static int vid_cap_queue_setup(struct vb2_queue *vq, const struct v4l2_format *f
 		 */
 		if (mp->num_planes != planes)
 			return -EINVAL;
-		vfmt = get_format(dev, mp->pixelformat);
+		vfmt = vivid_get_format(dev, mp->pixelformat);
 		for (p = 0; p < planes; p++) {
 			sizes[p] = mp->plane_fmt[p].sizeimage;
 			if (sizes[0] < tpg_g_bytesperline(&dev->tpg, 0) * h +
@@ -531,12 +531,12 @@ int vivid_try_fmt_vid_cap(struct file *file, void *priv,
 	unsigned w, h;
 	unsigned p;
 
-	fmt = get_format(dev, mp->pixelformat);
+	fmt = vivid_get_format(dev, mp->pixelformat);
 	if (!fmt) {
 		dprintk(dev, 1, "Fourcc format (0x%08x) unknown.\n",
 			mp->pixelformat);
 		mp->pixelformat = V4L2_PIX_FMT_YUYV;
-		fmt = get_format(dev, mp->pixelformat);
+		fmt = vivid_get_format(dev, mp->pixelformat);
 	}
 
 	mp->field = vivid_field_cap(dev, mp->field);
@@ -623,7 +623,7 @@ int vivid_s_fmt_vid_cap(struct file *file, void *priv,
 		return -EBUSY;
 	}
 
-	dev->fmt_cap = get_format(dev, mp->pixelformat);
+	dev->fmt_cap = vivid_get_format(dev, mp->pixelformat);
 	if (V4L2_FIELD_HAS_T_OR_B(mp->field))
 		factor = 2;
 
@@ -1180,7 +1180,7 @@ int vivid_vid_cap_s_fbuf(struct file *file, void *fh,
 
 	if (a->fmt.width < 48 || a->fmt.height < 32)
 		return -EINVAL;
-	fmt = get_format(dev, a->fmt.pixelformat);
+	fmt = vivid_get_format(dev, a->fmt.pixelformat);
 	if (!fmt || !fmt->can_do_overlay)
 		return -EINVAL;
 	if (a->fmt.bytesperline < (a->fmt.width * fmt->depth) / 8)
@@ -1610,7 +1610,7 @@ int vidioc_enum_framesizes(struct file *file, void *fh,
 
 	if (!vivid_is_webcam(dev) && !dev->has_scaler_cap)
 		return -EINVAL;
-	if (get_format(dev, fsize->pixel_format) == NULL)
+	if (vivid_get_format(dev, fsize->pixel_format) == NULL)
 		return -EINVAL;
 	if (vivid_is_webcam(dev)) {
 		if (fsize->index >= ARRAY_SIZE(webcam_sizes))
@@ -1639,7 +1639,7 @@ int vidioc_enum_frameintervals(struct file *file, void *priv,
 	const struct vivid_fmt *fmt;
 	int i;
 
-	fmt = get_format(dev, fival->pixel_format);
+	fmt = vivid_get_format(dev, fival->pixel_format);
 	if (!fmt)
 		return -EINVAL;
 
diff --git a/drivers/media/platform/vivid/vivid-vid-common.c b/drivers/media/platform/vivid/vivid-vid-common.c
index 7b981c176ad8..16cd6d2d2ed6 100644
--- a/drivers/media/platform/vivid/vivid-vid-common.c
+++ b/drivers/media/platform/vivid/vivid-vid-common.c
@@ -186,7 +186,7 @@ struct vivid_fmt vivid_formats[] = {
 /* There are 2 multiplanar formats in the list */
 #define VIVID_MPLANAR_FORMATS 2
 
-const struct vivid_fmt *get_format(struct vivid_dev *dev, u32 pixelformat)
+const struct vivid_fmt *vivid_get_format(struct vivid_dev *dev, u32 pixelformat)
 {
 	const struct vivid_fmt *fmt;
 	unsigned k;
diff --git a/drivers/media/platform/vivid/vivid-vid-common.h b/drivers/media/platform/vivid/vivid-vid-common.h
index 9563c327fe56..3ec4fa85c9b9 100644
--- a/drivers/media/platform/vivid/vivid-vid-common.h
+++ b/drivers/media/platform/vivid/vivid-vid-common.h
@@ -32,7 +32,7 @@ int fmt_sp2mp_func(struct file *file, void *priv,
 
 extern const struct v4l2_dv_timings_cap vivid_dv_timings_cap;
 
-const struct vivid_fmt *get_format(struct vivid_dev *dev, u32 pixelformat);
+const struct vivid_fmt *vivid_get_format(struct vivid_dev *dev, u32 pixelformat);
 
 bool vivid_vid_can_loop(struct vivid_dev *dev);
 void vivid_send_source_change(struct vivid_dev *dev, unsigned type);
diff --git a/drivers/media/platform/vivid/vivid-vid-out.c b/drivers/media/platform/vivid/vivid-vid-out.c
index 3078bd2fdc01..9fd803592864 100644
--- a/drivers/media/platform/vivid/vivid-vid-out.c
+++ b/drivers/media/platform/vivid/vivid-vid-out.c
@@ -340,12 +340,12 @@ int vivid_try_fmt_vid_out(struct file *file, void *priv,
 	unsigned w, h;
 	unsigned p;
 
-	fmt = get_format(dev, mp->pixelformat);
+	fmt = vivid_get_format(dev, mp->pixelformat);
 	if (!fmt) {
 		dprintk(dev, 1, "Fourcc format (0x%08x) unknown.\n",
 			mp->pixelformat);
 		mp->pixelformat = V4L2_PIX_FMT_YUYV;
-		fmt = get_format(dev, mp->pixelformat);
+		fmt = vivid_get_format(dev, mp->pixelformat);
 	}
 
 	mp->field = vivid_field_out(dev, mp->field);
@@ -440,7 +440,7 @@ int vivid_s_fmt_vid_out(struct file *file, void *priv,
 	if (vb2_is_busy(q))
 		goto set_colorspace;
 
-	dev->fmt_out = get_format(dev, mp->pixelformat);
+	dev->fmt_out = vivid_get_format(dev, mp->pixelformat);
 	if (V4L2_FIELD_HAS_T_OR_B(mp->field))
 		factor = 2;