diff options
| author | Hans Verkuil <hans.verkuil@cisco.com> | 2016-03-21 15:10:12 (GMT) |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2016-04-20 16:42:56 (GMT) |
| commit | e3a900a8fae22949523e0b6c3f0626ce5f3f48c3 (patch) | |
| tree | 477cbb2f19f14d963bc09183da5b417c5b4b49c7 /drivers/staging/media | |
| parent | 2e2dedb96ddd9e4f8d8a0330bc31ac56670a36b4 (diff) | |
| download | linux-e3a900a8fae22949523e0b6c3f0626ce5f3f48c3.tar.xz | |
[media] tw686x-kh: rename three functions to prevent clash with tw686x driver
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Diffstat (limited to 'drivers/staging/media')
| -rw-r--r-- | drivers/staging/media/tw686x-kh/tw686x-kh-core.c | 6 | ||||
| -rw-r--r-- | drivers/staging/media/tw686x-kh/tw686x-kh-video.c | 12 | ||||
| -rw-r--r-- | drivers/staging/media/tw686x-kh/tw686x-kh.h | 6 |
3 files changed, 12 insertions, 12 deletions
diff --git a/drivers/staging/media/tw686x-kh/tw686x-kh-core.c b/drivers/staging/media/tw686x-kh/tw686x-kh-core.c index c3c5c26..03b3b62 100644 --- a/drivers/staging/media/tw686x-kh/tw686x-kh-core.c +++ b/drivers/staging/media/tw686x-kh/tw686x-kh-core.c @@ -30,7 +30,7 @@ static irqreturn_t tw686x_irq(int irq, void *dev_id) spin_unlock_irqrestore(&dev->irq_lock, flags); if (int_status & 0xFF0000FF) - handled = tw686x_video_irq(dev); + handled = tw686x_kh_video_irq(dev); } return IRQ_RETVAL(handled); @@ -99,7 +99,7 @@ static int tw686x_probe(struct pci_dev *pci_dev, return err; } - err = tw686x_video_init(dev); + err = tw686x_kh_video_init(dev); if (err) return err; @@ -111,7 +111,7 @@ static void tw686x_remove(struct pci_dev *pci_dev) { struct tw686x_dev *dev = pci_get_drvdata(pci_dev); - tw686x_video_free(dev); + tw686x_kh_video_free(dev); } /* driver_data is number of A/V channels */ diff --git a/drivers/staging/media/tw686x-kh/tw686x-kh-video.c b/drivers/staging/media/tw686x-kh/tw686x-kh-video.c index 2065c6c..6ecb504 100644 --- a/drivers/staging/media/tw686x-kh/tw686x-kh-video.c +++ b/drivers/staging/media/tw686x-kh/tw686x-kh-video.c @@ -503,7 +503,7 @@ static int tw686x_s_input(struct file *file, void *priv, unsigned int v) return 0; } -const struct v4l2_file_operations tw686x_video_fops = { +static const struct v4l2_file_operations tw686x_video_fops = { .owner = THIS_MODULE, .open = v4l2_fh_open, .unlocked_ioctl = video_ioctl2, @@ -513,7 +513,7 @@ const struct v4l2_file_operations tw686x_video_fops = { .mmap = vb2_fop_mmap, }; -const struct v4l2_ioctl_ops tw686x_video_ioctl_ops = { +static const struct v4l2_ioctl_ops tw686x_video_ioctl_ops = { .vidioc_querycap = tw686x_querycap, .vidioc_enum_fmt_vid_cap = tw686x_enum_fmt_vid_cap, .vidioc_g_fmt_vid_cap = tw686x_g_fmt_vid_cap, @@ -616,7 +616,7 @@ static int video_thread(void *arg) return 0; } -int tw686x_video_irq(struct tw686x_dev *dev) +int tw686x_kh_video_irq(struct tw686x_dev *dev) { unsigned long flags, handled = 0; u32 requests; @@ -632,7 +632,7 @@ int tw686x_video_irq(struct tw686x_dev *dev) return handled; } -void tw686x_video_free(struct tw686x_dev *dev) +void tw686x_kh_video_free(struct tw686x_dev *dev) { unsigned int ch, n; @@ -660,7 +660,7 @@ void tw686x_video_free(struct tw686x_dev *dev) #define SG_TABLE_SIZE (MAX_SG_DESC_COUNT * sizeof(struct vdma_desc)) -int tw686x_video_init(struct tw686x_dev *dev) +int tw686x_kh_video_init(struct tw686x_dev *dev) { unsigned int ch, n; int err; @@ -816,6 +816,6 @@ int tw686x_video_init(struct tw686x_dev *dev) return 0; error: - tw686x_video_free(dev); + tw686x_kh_video_free(dev); return err; } diff --git a/drivers/staging/media/tw686x-kh/tw686x-kh.h b/drivers/staging/media/tw686x-kh/tw686x-kh.h index 46c4ebd..dc25796 100644 --- a/drivers/staging/media/tw686x-kh/tw686x-kh.h +++ b/drivers/staging/media/tw686x-kh/tw686x-kh.h @@ -113,6 +113,6 @@ static inline unsigned int is_second_gen(struct tw686x_dev *dev) return dev->type & TYPE_SECOND_GEN; } -int tw686x_video_irq(struct tw686x_dev *dev); -int tw686x_video_init(struct tw686x_dev *dev); -void tw686x_video_free(struct tw686x_dev *dev); +int tw686x_kh_video_irq(struct tw686x_dev *dev); +int tw686x_kh_video_init(struct tw686x_dev *dev); +void tw686x_kh_video_free(struct tw686x_dev *dev); |