V4L/DVB (7852): ivtv: prefix ivtv external functions with ivtv_

Fix conflict with cx18 driver.

Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

4 files changed, 15 insertions, 14 deletions

diff --git a/drivers/media/video/ivtv/ivtv-controls.c b/drivers/media/video/ivtv/ivtv-controls.c
index 8c02fa661591..c7e449f6397b 100644
--- a/drivers/media/video/ivtv/ivtv-controls.c
+++ b/drivers/media/video/ivtv/ivtv-controls.c
@@ -181,12 +181,12 @@ static int ivtv_setup_vbi_fmt(struct ivtv *itv, enum v4l2_mpeg_stream_vbi_fmt fm
                 return 0;
         }
         /* Need sliced data for mpeg insertion */
-        if (get_service_set(itv->vbi.sliced_in) == 0) {
+        if (ivtv_get_service_set(itv->vbi.sliced_in) == 0) {
                 if (itv->is_60hz)
                         itv->vbi.sliced_in->service_set = V4L2_SLICED_CAPTION_525;
                 else
                         itv->vbi.sliced_in->service_set = V4L2_SLICED_WSS_625;
-                expand_service_set(itv->vbi.sliced_in, itv->is_50hz);
+                ivtv_expand_service_set(itv->vbi.sliced_in, itv->is_50hz);
         }
         return 0;
 }
diff --git a/drivers/media/video/ivtv/ivtv-ioctl.c b/drivers/media/video/ivtv/ivtv-ioctl.c
index d508b5d0538c..26cc0f6699fd 100644
--- a/drivers/media/video/ivtv/ivtv-ioctl.c
+++ b/drivers/media/video/ivtv/ivtv-ioctl.c
@@ -38,7 +38,7 @@
 #include <linux/dvb/audio.h>
 #include <linux/i2c-id.h>
 
-u16 service2vbi(int type)
+u16 ivtv_service2vbi(int type)
 {
         switch (type) {
                 case V4L2_SLICED_TELETEXT_B:
@@ -88,7 +88,7 @@ static u16 select_service_from_set(int field, int line, u16 set, int is_pal)
         return 0;
 }
 
-void expand_service_set(struct v4l2_sliced_vbi_format *fmt, int is_pal)
+void ivtv_expand_service_set(struct v4l2_sliced_vbi_format *fmt, int is_pal)
 {
         u16 set = fmt->service_set;
         int f, l;
@@ -115,7 +115,7 @@ static int check_service_set(struct v4l2_sliced_vbi_format *fmt, int is_pal)
         return set != 0;
 }
 
-u16 get_service_set(struct v4l2_sliced_vbi_format *fmt)
+u16 ivtv_get_service_set(struct v4l2_sliced_vbi_format *fmt)
 {
         int f, l;
         u16 set = 0;
@@ -466,7 +466,7 @@ static int ivtv_get_fmt(struct ivtv *itv, int streamtype, struct v4l2_format *fm
                         vbifmt->service_lines[0][23] = V4L2_SLICED_WSS_625;
                         vbifmt->service_lines[0][16] = V4L2_SLICED_VPS;
                 }
-                vbifmt->service_set = get_service_set(vbifmt);
+                vbifmt->service_set = ivtv_get_service_set(vbifmt);
                 break;
         }
 
@@ -481,12 +481,12 @@ static int ivtv_get_fmt(struct ivtv *itv, int streamtype, struct v4l2_format *fm
                 if (streamtype == IVTV_DEC_STREAM_TYPE_VBI) {
                         vbifmt->service_set = itv->is_50hz ? V4L2_SLICED_VBI_625 :
                                                  V4L2_SLICED_VBI_525;
-                        expand_service_set(vbifmt, itv->is_50hz);
+                        ivtv_expand_service_set(vbifmt, itv->is_50hz);
                         break;
                 }
 
                 itv->video_dec_func(itv, VIDIOC_G_FMT, fmt);
-                vbifmt->service_set = get_service_set(vbifmt);
+                vbifmt->service_set = ivtv_get_service_set(vbifmt);
                 break;
         }
         case V4L2_BUF_TYPE_VBI_OUTPUT:
@@ -640,9 +640,9 @@ static int ivtv_try_or_set_fmt(struct ivtv *itv, int streamtype,
         memset(vbifmt->reserved, 0, sizeof(vbifmt->reserved));
 
         if (vbifmt->service_set)
-                expand_service_set(vbifmt, itv->is_50hz);
+                ivtv_expand_service_set(vbifmt, itv->is_50hz);
         set = check_service_set(vbifmt, itv->is_50hz);
-        vbifmt->service_set = get_service_set(vbifmt);
+        vbifmt->service_set = ivtv_get_service_set(vbifmt);
 
         if (!set_fmt)
                 return 0;
diff --git a/drivers/media/video/ivtv/ivtv-ioctl.h b/drivers/media/video/ivtv/ivtv-ioctl.h
index a03351b6853d..4e67f0ed1fc0 100644
--- a/drivers/media/video/ivtv/ivtv-ioctl.h
+++ b/drivers/media/video/ivtv/ivtv-ioctl.h
@@ -21,9 +21,9 @@
 #ifndef IVTV_IOCTL_H
 #define IVTV_IOCTL_H
 
-u16 service2vbi(int type);
-void expand_service_set(struct v4l2_sliced_vbi_format *fmt, int is_pal);
-u16 get_service_set(struct v4l2_sliced_vbi_format *fmt);
+u16 ivtv_service2vbi(int type);
+void ivtv_expand_service_set(struct v4l2_sliced_vbi_format *fmt, int is_pal);
+u16 ivtv_get_service_set(struct v4l2_sliced_vbi_format *fmt);
 int ivtv_v4l2_ioctl(struct inode *inode, struct file *filp, unsigned int cmd,
                     unsigned long arg);
 int ivtv_v4l2_ioctls(struct ivtv *itv, struct file *filp, unsigned int cmd, void *arg);
diff --git a/drivers/media/video/ivtv/ivtv-vbi.c b/drivers/media/video/ivtv/ivtv-vbi.c
index c151bcf5519a..71798f0da27f 100644
--- a/drivers/media/video/ivtv/ivtv-vbi.c
+++ b/drivers/media/video/ivtv/ivtv-vbi.c
@@ -169,7 +169,8 @@ static void copy_vbi_data(struct ivtv *itv, int lines, u32 pts_stamp)
                         linemask[0] |= (1 << l);
                 else
                         linemask[1] |= (1 << (l - 32));
-                dst[sd + 12 + line * 43] = service2vbi(itv->vbi.sliced_data[i].id);
+                dst[sd + 12 + line * 43] =
+                        ivtv_service2vbi(itv->vbi.sliced_data[i].id);
                 memcpy(dst + sd + 12 + line * 43 + 1, itv->vbi.sliced_data[i].data, 42);
                 line++;
         }