diff options
| author | Michael Krufky <mkrufky@linuxtv.org> | 2006-04-03 23:49:27 -0400 |
|---|---|---|
| committer | Michael Krufky <mkrufky@linuxtv.org> | 2006-04-03 23:49:27 -0400 |
| commit | cc7536722d24a3deec8ac51616e26f5dc267f112 (patch) | |
| tree | a3c909386bf5d0075896f8e42d4d9fd4415b3d7c | |
| parent | e375e2853810cf2cc8f734369c90b7c007d72a3f (diff) | |
| download | mediapointer-dvb-s2-cc7536722d24a3deec8ac51616e26f5dc267f112.tar.gz mediapointer-dvb-s2-cc7536722d24a3deec8ac51616e26f5dc267f112.tar.bz2 | |
fix warning: assignment discards qualifiers from pointer target type
From: Michael Krufky <mkrufky@linuxtv.org>
The following warning in all kernels < 2.6.17 is caused by
changeset a875912f0aada25949e3201bcd97e177040fa782 :
http://linuxtv.org/hg/v4l-dvb?cmd=changeset;node=a875912f0aad
videodev.c: In function 'video_open':
videodev.c:131: warning: assignment discards qualifiers from pointer target type
videodev.c:136: warning: assignment discards qualifiers from pointer target type
dvbdev.c: In function 'dvb_device_open':
dvbdev.c:105: warning: assignment discards qualifiers from pointer target type
This changeset restores backwards-compatability.
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
| -rw-r--r-- | linux/drivers/media/dvb/dvb-core/dvbdev.c | 4 | ||||
| -rw-r--r-- | linux/drivers/media/video/videodev.c | 4 | ||||
| -rw-r--r-- | linux/include/linux/videodev2.h | 4 |
3 files changed, 12 insertions, 0 deletions
diff --git a/linux/drivers/media/dvb/dvb-core/dvbdev.c b/linux/drivers/media/dvb/dvb-core/dvbdev.c index 85d6a6c65..9b824c31b 100644 --- a/linux/drivers/media/dvb/dvb-core/dvbdev.c +++ b/linux/drivers/media/dvb/dvb-core/dvbdev.c @@ -93,7 +93,11 @@ static int dvb_device_open(struct inode *inode, struct file *file) if (dvbdev && dvbdev->fops) { int err = 0; +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,17) const struct file_operations *old_fops; +#else + struct file_operations *old_fops; +#endif file->private_data = dvbdev; old_fops = file->f_op; diff --git a/linux/drivers/media/video/videodev.c b/linux/drivers/media/video/videodev.c index e54b8d9f7..c6d0825c8 100644 --- a/linux/drivers/media/video/videodev.c +++ b/linux/drivers/media/video/videodev.c @@ -111,7 +111,11 @@ static int video_open(struct inode *inode, struct file *file) unsigned int minor = iminor(inode); int err = 0; struct video_device *vfl; +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,17) const struct file_operations *old_fops; +#else + struct file_operations *old_fops; +#endif if(minor>=VIDEO_NUM_DEVICES) return -ENODEV; diff --git a/linux/include/linux/videodev2.h b/linux/include/linux/videodev2.h index 922980c61..54b8aca85 100644 --- a/linux/include/linux/videodev2.h +++ b/linux/include/linux/videodev2.h @@ -84,7 +84,11 @@ struct video_device int minor; /* device ops + callbacks */ +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,17) const struct file_operations *fops; +#else + struct file_operations *fops; +#endif void (*release)(struct video_device *vfd); #if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0) |