Re: [PATCH] V4L/DVB: constify function pointer tables
- Date: Sun, 27 Jan 2008 14:17:55 -0200
- From: Mauro Carvalho Chehab <mchehab@xxxxxxxxxxxxx>
- Subject: Re: [PATCH] V4L/DVB: constify function pointer tables
Hi Jan,
Your patch conflicted with some other changes at the development tree.
Could you please re-generate it?
Cheers,
Mauro.
On Tue, 22 Jan 2008 20:45:58 +0100 (CET)
Jan Engelhardt <jengelh@xxxxxxxxxxxxxxx> wrote:
> Signed-off-by: Jan Engelhardt <jengelh@xxxxxxxxxxxxxxx>
> ---
> drivers/media/dvb/dvb-core/dvbdev.c | 3 +--
> drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c | 2 +-
> drivers/media/radio/radio-gemtek.c | 2 +-
> drivers/media/video/ivtv/ivtv-streams.c | 4 ++--
> drivers/media/video/zr364xx.c | 2 +-
> 5 files changed, 6 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/media/dvb/dvb-core/dvbdev.c b/drivers/media/dvb/dvb-core/dvbdev.c
> index 18738fa..6d523d9 100644
> --- a/drivers/media/dvb/dvb-core/dvbdev.c
> +++ b/drivers/media/dvb/dvb-core/dvbdev.c
> @@ -97,8 +97,7 @@ static int dvb_device_open(struct inode *inode, struct file *file)
> }
>
>
> -static struct file_operations dvb_device_fops =
> -{
> +static const struct file_operations dvb_device_fops = {
> .owner = THIS_MODULE,
> .open = dvb_device_open,
> };
> diff --git a/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c b/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c
> index 7902ae1..98deebc 100644
> --- a/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c
> +++ b/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c
> @@ -1005,7 +1005,7 @@ static int stc_release(struct inode *inode, struct file *file)
> return 0;
> }
>
> -static struct file_operations stc_fops = {
> +static const struct file_operations stc_fops = {
> .owner = THIS_MODULE,
> .read = stc_read,
> .open = stc_open,
> diff --git a/drivers/media/radio/radio-gemtek.c b/drivers/media/radio/radio-gemtek.c
> index 5e4b9dd..d69412f 100644
> --- a/drivers/media/radio/radio-gemtek.c
> +++ b/drivers/media/radio/radio-gemtek.c
> @@ -392,7 +392,7 @@ static struct v4l2_queryctrl radio_qctrl[] = {
> }
> };
>
> -static struct file_operations gemtek_fops = {
> +static const struct file_operations gemtek_fops = {
> .owner = THIS_MODULE,
> .open = video_exclusive_open,
> .release = video_exclusive_release,
> diff --git a/drivers/media/video/ivtv/ivtv-streams.c b/drivers/media/video/ivtv/ivtv-streams.c
> index 74fb0e0..a5bfbd9 100644
> --- a/drivers/media/video/ivtv/ivtv-streams.c
> +++ b/drivers/media/video/ivtv/ivtv-streams.c
> @@ -43,7 +43,7 @@
> #include "ivtv-cards.h"
> #include "ivtv-streams.h"
>
> -static struct file_operations ivtv_v4l2_enc_fops = {
> +static const struct file_operations ivtv_v4l2_enc_fops = {
> .owner = THIS_MODULE,
> .read = ivtv_v4l2_read,
> .write = ivtv_v4l2_write,
> @@ -53,7 +53,7 @@ static struct file_operations ivtv_v4l2_enc_fops = {
> .poll = ivtv_v4l2_enc_poll,
> };
>
> -static struct file_operations ivtv_v4l2_dec_fops = {
> +static const struct file_operations ivtv_v4l2_dec_fops = {
> .owner = THIS_MODULE,
> .read = ivtv_v4l2_read,
> .write = ivtv_v4l2_write,
> diff --git a/drivers/media/video/zr364xx.c b/drivers/media/video/zr364xx.c
> index 6f18925..1fdbb46 100644
> --- a/drivers/media/video/zr364xx.c
> +++ b/drivers/media/video/zr364xx.c
> @@ -749,7 +749,7 @@ static int zr364xx_mmap(struct file *file, struct vm_area_struct *vma)
> }
>
>
> -static struct file_operations zr364xx_fops = {
> +static const struct file_operations zr364xx_fops = {
> .owner = THIS_MODULE,
> .open = zr364xx_open,
> .release = zr364xx_release,
Cheers,
Mauro
--
video4linux-list mailing list
Unsubscribe mailto:video4linux-list-request@xxxxxxxxxx?subject=unsubscribe
https://www.redhat.com/mailman/listinfo/video4linux-list