The patch number 10391 was added via Mauro Carvalho Chehab <mche...@redhat.com>
to http://linuxtv.org/hg/v4l-dvb master development tree.
Kernel patches in this development tree may be modified to be backward
compatible with older kernels. Compatibility modifications will be
removed before inclusion into the mainstream Kernel
If anyone has any objections, please let us know by sending a message to:
Linux Media Mailing List <linux-me...@vger.kernel.org>
------
From: Jan Engelhardt <jeng...@medozas.de>
dvb: constify VFTs
dvb: constify VFTs
Signed-off-by: Jan Engelhardt <jeng...@medozas.de>
Signed-off-by: Mauro Carvalho Chehab <mche...@redhat.com>
---
linux/drivers/media/dvb/bt8xx/dst_ca.c | 2 +-
linux/drivers/media/dvb/dvb-core/dmxdev.c | 2 +-
linux/drivers/media/dvb/dvb-core/dvb_ca_en50221.c | 2 +-
linux/drivers/media/dvb/dvb-core/dvb_frontend.c | 2 +-
linux/drivers/media/dvb/dvb-core/dvb_net.c | 2 +-
linux/drivers/media/dvb/dvb-core/dvbdev.c | 4 ++--
linux/drivers/media/dvb/dvb-core/dvbdev.h | 2 +-
linux/drivers/media/dvb/ttpci/av7110.c | 2 +-
linux/drivers/media/dvb/ttpci/av7110_av.c | 4 ++--
linux/drivers/media/dvb/ttpci/av7110_ca.c | 2 +-
10 files changed, 12 insertions(+), 12 deletions(-)
diff -r 43dbc8ebb5a2 -r 2157be5a8dd3 linux/drivers/media/dvb/bt8xx/dst_ca.c
--- a/linux/drivers/media/dvb/bt8xx/dst_ca.c Tue Jan 27 23:47:50 2009 -0200
+++ b/linux/drivers/media/dvb/bt8xx/dst_ca.c Sun Jan 11 09:12:43 2009 +0000
@@ -778,7 +778,7 @@ static ssize_t dst_ca_write(struct file
return 0;
}
-static struct file_operations dst_ca_fops = {
+static const struct file_operations dst_ca_fops = {
.owner = THIS_MODULE,
.ioctl = dst_ca_ioctl,
.open = dst_ca_open,
diff -r 43dbc8ebb5a2 -r 2157be5a8dd3 linux/drivers/media/dvb/dvb-core/dmxdev.c
--- a/linux/drivers/media/dvb/dvb-core/dmxdev.c Tue Jan 27 23:47:50 2009 -0200
+++ b/linux/drivers/media/dvb/dvb-core/dmxdev.c Sun Jan 11 09:12:43 2009 +0000
@@ -1026,7 +1026,7 @@ static int dvb_demux_release(struct inod
return ret;
}
-static struct file_operations dvb_demux_fops = {
+static const struct file_operations dvb_demux_fops = {
.owner = THIS_MODULE,
.read = dvb_demux_read,
.ioctl = dvb_demux_ioctl,
diff -r 43dbc8ebb5a2 -r 2157be5a8dd3
linux/drivers/media/dvb/dvb-core/dvb_ca_en50221.c
--- a/linux/drivers/media/dvb/dvb-core/dvb_ca_en50221.c Tue Jan 27 23:47:50
2009 -0200
+++ b/linux/drivers/media/dvb/dvb-core/dvb_ca_en50221.c Sun Jan 11 09:12:43
2009 +0000
@@ -1608,7 +1608,7 @@ EXPORT_SYMBOL(dvb_ca_en50221_init);
EXPORT_SYMBOL(dvb_ca_en50221_init);
-static struct file_operations dvb_ca_fops = {
+static const struct file_operations dvb_ca_fops = {
.owner = THIS_MODULE,
.read = dvb_ca_en50221_io_read,
.write = dvb_ca_en50221_io_write,
diff -r 43dbc8ebb5a2 -r 2157be5a8dd3
linux/drivers/media/dvb/dvb-core/dvb_frontend.c
--- a/linux/drivers/media/dvb/dvb-core/dvb_frontend.c Tue Jan 27 23:47:50
2009 -0200
+++ b/linux/drivers/media/dvb/dvb-core/dvb_frontend.c Sun Jan 11 09:12:43
2009 +0000
@@ -1989,7 +1989,7 @@ static int dvb_frontend_release(struct i
return ret;
}
-static struct file_operations dvb_frontend_fops = {
+static const struct file_operations dvb_frontend_fops = {
.owner = THIS_MODULE,
.ioctl = dvb_generic_ioctl,
.poll = dvb_frontend_poll,
diff -r 43dbc8ebb5a2 -r 2157be5a8dd3 linux/drivers/media/dvb/dvb-core/dvb_net.c
--- a/linux/drivers/media/dvb/dvb-core/dvb_net.c Tue Jan 27 23:47:50
2009 -0200
+++ b/linux/drivers/media/dvb/dvb-core/dvb_net.c Sun Jan 11 09:12:43
2009 +0000
@@ -1526,7 +1526,7 @@ static int dvb_net_close(struct inode *i
}
-static struct file_operations dvb_net_fops = {
+static const struct file_operations dvb_net_fops = {
.owner = THIS_MODULE,
.ioctl = dvb_net_ioctl,
.open = dvb_generic_open,
diff -r 43dbc8ebb5a2 -r 2157be5a8dd3 linux/drivers/media/dvb/dvb-core/dvbdev.c
--- a/linux/drivers/media/dvb/dvb-core/dvbdev.c Tue Jan 27 23:47:50 2009 -0200
+++ b/linux/drivers/media/dvb/dvb-core/dvbdev.c Sun Jan 11 09:12:43 2009 +0000
@@ -237,8 +237,8 @@ int dvb_register_device(struct dvb_adapt
dvbdev->fops = dvbdevfops;
init_waitqueue_head (&dvbdev->wait_queue);
- memcpy(dvbdev->fops, template->fops, sizeof(struct file_operations));
- dvbdev->fops->owner = adap->module;
+ memcpy(dvbdevfops, template->fops, sizeof(struct file_operations));
+ dvbdevfops->owner = adap->module;
list_add_tail (&dvbdev->list_head, &adap->device_list);
diff -r 43dbc8ebb5a2 -r 2157be5a8dd3 linux/drivers/media/dvb/dvb-core/dvbdev.h
--- a/linux/drivers/media/dvb/dvb-core/dvbdev.h Tue Jan 27 23:47:50 2009 -0200
+++ b/linux/drivers/media/dvb/dvb-core/dvbdev.h Sun Jan 11 09:12:43 2009 +0000
@@ -71,7 +71,7 @@ struct dvb_adapter {
struct dvb_device {
struct list_head list_head;
- struct file_operations *fops;
+ const struct file_operations *fops;
struct dvb_adapter *adapter;
int type;
int minor;
diff -r 43dbc8ebb5a2 -r 2157be5a8dd3 linux/drivers/media/dvb/ttpci/av7110.c
--- a/linux/drivers/media/dvb/ttpci/av7110.c Tue Jan 27 23:47:50 2009 -0200
+++ b/linux/drivers/media/dvb/ttpci/av7110.c Sun Jan 11 09:12:43 2009 +0000
@@ -728,7 +728,7 @@ static int dvb_osd_ioctl(struct inode *i
}
-static struct file_operations dvb_osd_fops = {
+static const struct file_operations dvb_osd_fops = {
.owner = THIS_MODULE,
.ioctl = dvb_generic_ioctl,
.open = dvb_generic_open,
diff -r 43dbc8ebb5a2 -r 2157be5a8dd3 linux/drivers/media/dvb/ttpci/av7110_av.c
--- a/linux/drivers/media/dvb/ttpci/av7110_av.c Tue Jan 27 23:47:50 2009 -0200
+++ b/linux/drivers/media/dvb/ttpci/av7110_av.c Sun Jan 11 09:12:43 2009 +0000
@@ -1456,7 +1456,7 @@ static int dvb_audio_release(struct inod
* driver registration
******************************************************************************/
-static struct file_operations dvb_video_fops = {
+static const struct file_operations dvb_video_fops = {
.owner = THIS_MODULE,
.write = dvb_video_write,
.ioctl = dvb_generic_ioctl,
@@ -1474,7 +1474,7 @@ static struct dvb_device dvbdev_video =
.kernel_ioctl = dvb_video_ioctl,
};
-static struct file_operations dvb_audio_fops = {
+static const struct file_operations dvb_audio_fops = {
.owner = THIS_MODULE,
.write = dvb_audio_write,
.ioctl = dvb_generic_ioctl,
diff -r 43dbc8ebb5a2 -r 2157be5a8dd3 linux/drivers/media/dvb/ttpci/av7110_ca.c
--- a/linux/drivers/media/dvb/ttpci/av7110_ca.c Tue Jan 27 23:47:50 2009 -0200
+++ b/linux/drivers/media/dvb/ttpci/av7110_ca.c Sun Jan 11 09:12:43 2009 +0000
@@ -345,7 +345,7 @@ static ssize_t dvb_ca_read(struct file *
return ci_ll_read(&av7110->ci_rbuffer, file, buf, count, ppos);
}
-static struct file_operations dvb_ca_fops = {
+static const struct file_operations dvb_ca_fops = {
.owner = THIS_MODULE,
.read = dvb_ca_read,
.write = dvb_ca_write,
---
Patch is available at:
http://linuxtv.org/hg/v4l-dvb/rev/2157be5a8dd37c131694ca85c8d13164f162e090
_______________________________________________
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
