diff options
author | Jan Engelhardt <jengelh@medozas.de> | 2009-01-11 04:12:43 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-03-30 11:42:34 -0400 |
commit | 784e29d2031b535637f65a8b81fb0871c7c51b3f (patch) | |
tree | 843622fb757070e5ad20c969c08617a87b57cc55 | |
parent | c675e79c917c02a54f54fcac3776ccf0b428bd37 (diff) |
V4L/DVB (10391): dvb: constify VFTs
dvb: constify VFTs
Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r-- | drivers/media/dvb/bt8xx/dst_ca.c | 2 | ||||
-rw-r--r-- | drivers/media/dvb/dvb-core/dmxdev.c | 2 | ||||
-rw-r--r-- | drivers/media/dvb/dvb-core/dvb_ca_en50221.c | 2 | ||||
-rw-r--r-- | drivers/media/dvb/dvb-core/dvb_frontend.c | 2 | ||||
-rw-r--r-- | drivers/media/dvb/dvb-core/dvb_net.c | 2 | ||||
-rw-r--r-- | drivers/media/dvb/dvb-core/dvbdev.c | 4 | ||||
-rw-r--r-- | drivers/media/dvb/dvb-core/dvbdev.h | 2 | ||||
-rw-r--r-- | drivers/media/dvb/ttpci/av7110.c | 2 | ||||
-rw-r--r-- | drivers/media/dvb/ttpci/av7110_av.c | 4 | ||||
-rw-r--r-- | drivers/media/dvb/ttpci/av7110_ca.c | 2 |
10 files changed, 12 insertions, 12 deletions
diff --git a/drivers/media/dvb/bt8xx/dst_ca.c b/drivers/media/dvb/bt8xx/dst_ca.c index 0258451423ad..6c68f02c1709 100644 --- a/drivers/media/dvb/bt8xx/dst_ca.c +++ b/drivers/media/dvb/bt8xx/dst_ca.c | |||
@@ -682,7 +682,7 @@ static ssize_t dst_ca_write(struct file *file, const char __user *buffer, size_t | |||
682 | return 0; | 682 | return 0; |
683 | } | 683 | } |
684 | 684 | ||
685 | static struct file_operations dst_ca_fops = { | 685 | static const struct file_operations dst_ca_fops = { |
686 | .owner = THIS_MODULE, | 686 | .owner = THIS_MODULE, |
687 | .ioctl = dst_ca_ioctl, | 687 | .ioctl = dst_ca_ioctl, |
688 | .open = dst_ca_open, | 688 | .open = dst_ca_open, |
diff --git a/drivers/media/dvb/dvb-core/dmxdev.c b/drivers/media/dvb/dvb-core/dmxdev.c index 069d847ba887..c35fbb8d8f4a 100644 --- a/drivers/media/dvb/dvb-core/dmxdev.c +++ b/drivers/media/dvb/dvb-core/dmxdev.c | |||
@@ -1024,7 +1024,7 @@ static int dvb_demux_release(struct inode *inode, struct file *file) | |||
1024 | return ret; | 1024 | return ret; |
1025 | } | 1025 | } |
1026 | 1026 | ||
1027 | static struct file_operations dvb_demux_fops = { | 1027 | static const struct file_operations dvb_demux_fops = { |
1028 | .owner = THIS_MODULE, | 1028 | .owner = THIS_MODULE, |
1029 | .read = dvb_demux_read, | 1029 | .read = dvb_demux_read, |
1030 | .ioctl = dvb_demux_ioctl, | 1030 | .ioctl = dvb_demux_ioctl, |
diff --git a/drivers/media/dvb/dvb-core/dvb_ca_en50221.c b/drivers/media/dvb/dvb-core/dvb_ca_en50221.c index 7e3aeaa7370f..cb22da53bfb0 100644 --- a/drivers/media/dvb/dvb-core/dvb_ca_en50221.c +++ b/drivers/media/dvb/dvb-core/dvb_ca_en50221.c | |||
@@ -1607,7 +1607,7 @@ static unsigned int dvb_ca_en50221_io_poll(struct file *file, poll_table * wait) | |||
1607 | EXPORT_SYMBOL(dvb_ca_en50221_init); | 1607 | EXPORT_SYMBOL(dvb_ca_en50221_init); |
1608 | 1608 | ||
1609 | 1609 | ||
1610 | static struct file_operations dvb_ca_fops = { | 1610 | static const struct file_operations dvb_ca_fops = { |
1611 | .owner = THIS_MODULE, | 1611 | .owner = THIS_MODULE, |
1612 | .read = dvb_ca_en50221_io_read, | 1612 | .read = dvb_ca_en50221_io_read, |
1613 | .write = dvb_ca_en50221_io_write, | 1613 | .write = dvb_ca_en50221_io_write, |
diff --git a/drivers/media/dvb/dvb-core/dvb_frontend.c b/drivers/media/dvb/dvb-core/dvb_frontend.c index 8dcb3fbf7acd..ebc78157b9b8 100644 --- a/drivers/media/dvb/dvb-core/dvb_frontend.c +++ b/drivers/media/dvb/dvb-core/dvb_frontend.c | |||
@@ -1875,7 +1875,7 @@ static int dvb_frontend_release(struct inode *inode, struct file *file) | |||
1875 | return ret; | 1875 | return ret; |
1876 | } | 1876 | } |
1877 | 1877 | ||
1878 | static struct file_operations dvb_frontend_fops = { | 1878 | static const struct file_operations dvb_frontend_fops = { |
1879 | .owner = THIS_MODULE, | 1879 | .owner = THIS_MODULE, |
1880 | .ioctl = dvb_generic_ioctl, | 1880 | .ioctl = dvb_generic_ioctl, |
1881 | .poll = dvb_frontend_poll, | 1881 | .poll = dvb_frontend_poll, |
diff --git a/drivers/media/dvb/dvb-core/dvb_net.c b/drivers/media/dvb/dvb-core/dvb_net.c index f6ba8468858e..8280f8d66a38 100644 --- a/drivers/media/dvb/dvb-core/dvb_net.c +++ b/drivers/media/dvb/dvb-core/dvb_net.c | |||
@@ -1459,7 +1459,7 @@ static int dvb_net_close(struct inode *inode, struct file *file) | |||
1459 | } | 1459 | } |
1460 | 1460 | ||
1461 | 1461 | ||
1462 | static struct file_operations dvb_net_fops = { | 1462 | static const struct file_operations dvb_net_fops = { |
1463 | .owner = THIS_MODULE, | 1463 | .owner = THIS_MODULE, |
1464 | .ioctl = dvb_net_ioctl, | 1464 | .ioctl = dvb_net_ioctl, |
1465 | .open = dvb_generic_open, | 1465 | .open = dvb_generic_open, |
diff --git a/drivers/media/dvb/dvb-core/dvbdev.c b/drivers/media/dvb/dvb-core/dvbdev.c index 6a32680dbb1b..a454ee8f1e43 100644 --- a/drivers/media/dvb/dvb-core/dvbdev.c +++ b/drivers/media/dvb/dvb-core/dvbdev.c | |||
@@ -228,8 +228,8 @@ int dvb_register_device(struct dvb_adapter *adap, struct dvb_device **pdvbdev, | |||
228 | dvbdev->fops = dvbdevfops; | 228 | dvbdev->fops = dvbdevfops; |
229 | init_waitqueue_head (&dvbdev->wait_queue); | 229 | init_waitqueue_head (&dvbdev->wait_queue); |
230 | 230 | ||
231 | memcpy(dvbdev->fops, template->fops, sizeof(struct file_operations)); | 231 | memcpy(dvbdevfops, template->fops, sizeof(struct file_operations)); |
232 | dvbdev->fops->owner = adap->module; | 232 | dvbdevfops->owner = adap->module; |
233 | 233 | ||
234 | list_add_tail (&dvbdev->list_head, &adap->device_list); | 234 | list_add_tail (&dvbdev->list_head, &adap->device_list); |
235 | 235 | ||
diff --git a/drivers/media/dvb/dvb-core/dvbdev.h b/drivers/media/dvb/dvb-core/dvbdev.h index dca49cf962e8..79927305e84d 100644 --- a/drivers/media/dvb/dvb-core/dvbdev.h +++ b/drivers/media/dvb/dvb-core/dvbdev.h | |||
@@ -71,7 +71,7 @@ struct dvb_adapter { | |||
71 | 71 | ||
72 | struct dvb_device { | 72 | struct dvb_device { |
73 | struct list_head list_head; | 73 | struct list_head list_head; |
74 | struct file_operations *fops; | 74 | const struct file_operations *fops; |
75 | struct dvb_adapter *adapter; | 75 | struct dvb_adapter *adapter; |
76 | int type; | 76 | int type; |
77 | int minor; | 77 | int minor; |
diff --git a/drivers/media/dvb/ttpci/av7110.c b/drivers/media/dvb/ttpci/av7110.c index aa1ff524256e..4624cee93e74 100644 --- a/drivers/media/dvb/ttpci/av7110.c +++ b/drivers/media/dvb/ttpci/av7110.c | |||
@@ -725,7 +725,7 @@ static int dvb_osd_ioctl(struct inode *inode, struct file *file, | |||
725 | } | 725 | } |
726 | 726 | ||
727 | 727 | ||
728 | static struct file_operations dvb_osd_fops = { | 728 | static const struct file_operations dvb_osd_fops = { |
729 | .owner = THIS_MODULE, | 729 | .owner = THIS_MODULE, |
730 | .ioctl = dvb_generic_ioctl, | 730 | .ioctl = dvb_generic_ioctl, |
731 | .open = dvb_generic_open, | 731 | .open = dvb_generic_open, |
diff --git a/drivers/media/dvb/ttpci/av7110_av.c b/drivers/media/dvb/ttpci/av7110_av.c index bdc62acf2099..e4d0900d5121 100644 --- a/drivers/media/dvb/ttpci/av7110_av.c +++ b/drivers/media/dvb/ttpci/av7110_av.c | |||
@@ -1456,7 +1456,7 @@ static int dvb_audio_release(struct inode *inode, struct file *file) | |||
1456 | * driver registration | 1456 | * driver registration |
1457 | ******************************************************************************/ | 1457 | ******************************************************************************/ |
1458 | 1458 | ||
1459 | static struct file_operations dvb_video_fops = { | 1459 | static const struct file_operations dvb_video_fops = { |
1460 | .owner = THIS_MODULE, | 1460 | .owner = THIS_MODULE, |
1461 | .write = dvb_video_write, | 1461 | .write = dvb_video_write, |
1462 | .ioctl = dvb_generic_ioctl, | 1462 | .ioctl = dvb_generic_ioctl, |
@@ -1474,7 +1474,7 @@ static struct dvb_device dvbdev_video = { | |||
1474 | .kernel_ioctl = dvb_video_ioctl, | 1474 | .kernel_ioctl = dvb_video_ioctl, |
1475 | }; | 1475 | }; |
1476 | 1476 | ||
1477 | static struct file_operations dvb_audio_fops = { | 1477 | static const struct file_operations dvb_audio_fops = { |
1478 | .owner = THIS_MODULE, | 1478 | .owner = THIS_MODULE, |
1479 | .write = dvb_audio_write, | 1479 | .write = dvb_audio_write, |
1480 | .ioctl = dvb_generic_ioctl, | 1480 | .ioctl = dvb_generic_ioctl, |
diff --git a/drivers/media/dvb/ttpci/av7110_ca.c b/drivers/media/dvb/ttpci/av7110_ca.c index 261135ded481..c7a65b1544a3 100644 --- a/drivers/media/dvb/ttpci/av7110_ca.c +++ b/drivers/media/dvb/ttpci/av7110_ca.c | |||
@@ -345,7 +345,7 @@ static ssize_t dvb_ca_read(struct file *file, char __user *buf, | |||
345 | return ci_ll_read(&av7110->ci_rbuffer, file, buf, count, ppos); | 345 | return ci_ll_read(&av7110->ci_rbuffer, file, buf, count, ppos); |
346 | } | 346 | } |
347 | 347 | ||
348 | static struct file_operations dvb_ca_fops = { | 348 | static const struct file_operations dvb_ca_fops = { |
349 | .owner = THIS_MODULE, | 349 | .owner = THIS_MODULE, |
350 | .read = dvb_ca_read, | 350 | .read = dvb_ca_read, |
351 | .write = dvb_ca_write, | 351 | .write = dvb_ca_write, |