aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/media/usb/usbtv/usbtv-core.c4
-rw-r--r--drivers/media/usb/usbtv/usbtv-video.c6
2 files changed, 5 insertions, 5 deletions
diff --git a/drivers/media/usb/usbtv/usbtv-core.c b/drivers/media/usb/usbtv/usbtv-core.c
index d543928d4f01..2f87ddfa469f 100644
--- a/drivers/media/usb/usbtv/usbtv-core.c
+++ b/drivers/media/usb/usbtv/usbtv-core.c
@@ -114,7 +114,7 @@ static void usbtv_disconnect(struct usb_interface *intf)
114 v4l2_device_put(&usbtv->v4l2_dev); 114 v4l2_device_put(&usbtv->v4l2_dev);
115} 115}
116 116
117struct usb_device_id usbtv_id_table[] = { 117static struct usb_device_id usbtv_id_table[] = {
118 { USB_DEVICE(0x1b71, 0x3002) }, 118 { USB_DEVICE(0x1b71, 0x3002) },
119 {} 119 {}
120}; 120};
@@ -124,7 +124,7 @@ MODULE_AUTHOR("Lubomir Rintel");
124MODULE_DESCRIPTION("Fushicai USBTV007 Video Grabber Driver"); 124MODULE_DESCRIPTION("Fushicai USBTV007 Video Grabber Driver");
125MODULE_LICENSE("Dual BSD/GPL"); 125MODULE_LICENSE("Dual BSD/GPL");
126 126
127struct usb_driver usbtv_usb_driver = { 127static struct usb_driver usbtv_usb_driver = {
128 .name = "usbtv", 128 .name = "usbtv",
129 .id_table = usbtv_id_table, 129 .id_table = usbtv_id_table,
130 .probe = usbtv_probe, 130 .probe = usbtv_probe,
diff --git a/drivers/media/usb/usbtv/usbtv-video.c b/drivers/media/usb/usbtv/usbtv-video.c
index 01ed1ec89989..20365bd69d05 100644
--- a/drivers/media/usb/usbtv/usbtv-video.c
+++ b/drivers/media/usb/usbtv/usbtv-video.c
@@ -562,7 +562,7 @@ static int usbtv_s_input(struct file *file, void *priv, unsigned int i)
562 return usbtv_select_input(usbtv, i); 562 return usbtv_select_input(usbtv, i);
563} 563}
564 564
565struct v4l2_ioctl_ops usbtv_ioctl_ops = { 565static struct v4l2_ioctl_ops usbtv_ioctl_ops = {
566 .vidioc_querycap = usbtv_querycap, 566 .vidioc_querycap = usbtv_querycap,
567 .vidioc_enum_input = usbtv_enum_input, 567 .vidioc_enum_input = usbtv_enum_input,
568 .vidioc_enum_fmt_vid_cap = usbtv_enum_fmt_vid_cap, 568 .vidioc_enum_fmt_vid_cap = usbtv_enum_fmt_vid_cap,
@@ -584,7 +584,7 @@ struct v4l2_ioctl_ops usbtv_ioctl_ops = {
584 .vidioc_streamoff = vb2_ioctl_streamoff, 584 .vidioc_streamoff = vb2_ioctl_streamoff,
585}; 585};
586 586
587struct v4l2_file_operations usbtv_fops = { 587static struct v4l2_file_operations usbtv_fops = {
588 .owner = THIS_MODULE, 588 .owner = THIS_MODULE,
589 .unlocked_ioctl = video_ioctl2, 589 .unlocked_ioctl = video_ioctl2,
590 .mmap = vb2_fop_mmap, 590 .mmap = vb2_fop_mmap,
@@ -645,7 +645,7 @@ static int usbtv_stop_streaming(struct vb2_queue *vq)
645 return 0; 645 return 0;
646} 646}
647 647
648struct vb2_ops usbtv_vb2_ops = { 648static struct vb2_ops usbtv_vb2_ops = {
649 .queue_setup = usbtv_queue_setup, 649 .queue_setup = usbtv_queue_setup,
650 .buf_queue = usbtv_buf_queue, 650 .buf_queue = usbtv_buf_queue,
651 .start_streaming = usbtv_start_streaming, 651 .start_streaming = usbtv_start_streaming,