hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[media] v4l2: make vidioc_s_fbuf const 

Write-only ioctls should have a const argument in the ioctl op.
Do this conversion for vidioc_s_fbuf.
Adding const for write-only ioctls was decided during the 2012 Media Workshop.

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Hans Verkuil 2012-09-04 10:26:45 -03:00 committed by Mauro Carvalho Chehab
parent 06fce2861d
commit e6eb28c220
8 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/media/common/saa7146/saa7146_video.c
View File

@ -479,7 +479,7 @@ static int vidioc_g_fbuf(struct file *file, void *fh, struct v4l2_framebuffer *f
return 0; return 0;
} }
static int vidioc_s_fbuf(struct file *file, void *fh, struct v4l2_framebuffer *fb) static int vidioc_s_fbuf(struct file *file, void *fh, const struct v4l2_framebuffer *fb)
{ {
struct saa7146_dev *dev = ((struct saa7146_fh *)fh)->dev; struct saa7146_dev *dev = ((struct saa7146_fh *)fh)->dev;
struct saa7146_vv *vv = dev->vv_data; struct saa7146_vv *vv = dev->vv_data;

2
drivers/media/pci/bt8xx/bttv-driver.c
View File

@ -2740,7 +2740,7 @@ static int bttv_overlay(struct file *file, void *f, unsigned int on)
} }
static int bttv_s_fbuf(struct file *file, void *f, static int bttv_s_fbuf(struct file *file, void *f,
struct v4l2_framebuffer *fb) const struct v4l2_framebuffer *fb)
{ {
struct bttv_fh *fh = f; struct bttv_fh *fh = f;
struct bttv *btv = fh->btv; struct bttv *btv = fh->btv;

4
drivers/media/pci/ivtv/ivtv-ioctl.c
View File

@ -1427,7 +1427,7 @@ static int ivtv_g_fbuf(struct file *file, void *fh, struct v4l2_framebuffer *fb)
return 0; return 0;
} }
static int ivtv_s_fbuf(struct file *file, void *fh, struct v4l2_framebuffer *fb) static int ivtv_s_fbuf(struct file *file, void *fh, const struct v4l2_framebuffer *fb)
{ {
struct ivtv_open_id *id = fh2id(fh); struct ivtv_open_id *id = fh2id(fh);
struct ivtv *itv = id->itv; struct ivtv *itv = id->itv;
@ -1444,7 +1444,7 @@ static int ivtv_s_fbuf(struct file *file, void *fh, struct v4l2_framebuffer *fb)
itv->osd_chroma_key_state = (fb->flags & V4L2_FBUF_FLAG_CHROMAKEY) != 0; itv->osd_chroma_key_state = (fb->flags & V4L2_FBUF_FLAG_CHROMAKEY) != 0;
ivtv_set_osd_alpha(itv); ivtv_set_osd_alpha(itv);
yi->track_osd = (fb->flags & V4L2_FBUF_FLAG_OVERLAY) != 0; yi->track_osd = (fb->flags & V4L2_FBUF_FLAG_OVERLAY) != 0;
return ivtv_g_fbuf(file, fh, fb); return 0;
} }
static int ivtv_overlay(struct file *file, void *fh, unsigned int on) static int ivtv_overlay(struct file *file, void *fh, unsigned int on)

2
drivers/media/pci/saa7134/saa7134-video.c
View File

@ -2158,7 +2158,7 @@ static int saa7134_g_fbuf(struct file *file, void *f,
} }
static int saa7134_s_fbuf(struct file *file, void *f, static int saa7134_s_fbuf(struct file *file, void *f,
struct v4l2_framebuffer *fb) const struct v4l2_framebuffer *fb)
{ {
struct saa7134_fh *fh = f; struct saa7134_fh *fh = f;
struct saa7134_dev *dev = fh->dev; struct saa7134_dev *dev = fh->dev;

2
drivers/media/pci/zoran/zoran_driver.c
View File

@ -1978,7 +1978,7 @@ static int zoran_g_fbuf(struct file *file, void *__fh,
} }
static int zoran_s_fbuf(struct file *file, void *__fh, static int zoran_s_fbuf(struct file *file, void *__fh,
struct v4l2_framebuffer *fb) const struct v4l2_framebuffer *fb)
{ {
struct zoran_fh *fh = __fh; struct zoran_fh *fh = __fh;
struct zoran *zr = fh->zr; struct zoran *zr = fh->zr;

2
drivers/media/platform/fsl-viu.c
View File

@ -860,7 +860,7 @@ int vidioc_g_fbuf(struct file *file, void *priv, struct v4l2_framebuffer *arg)
return 0; return 0;
} }
int vidioc_s_fbuf(struct file *file, void *priv, struct v4l2_framebuffer *arg) int vidioc_s_fbuf(struct file *file, void *priv, const struct v4l2_framebuffer *arg)
{ {
struct viu_fh *fh = priv; struct viu_fh *fh = priv;
struct viu_dev *dev = fh->dev; struct viu_dev *dev = fh->dev;

2
drivers/media/platform/omap/omap_vout.c
View File

@ -1744,7 +1744,7 @@ static int vidioc_streamoff(struct file *file, void *fh, enum v4l2_buf_type i)
} }
static int vidioc_s_fbuf(struct file *file, void *fh, static int vidioc_s_fbuf(struct file *file, void *fh,
struct v4l2_framebuffer *a) const struct v4l2_framebuffer *a)
{ {
int enable = 0; int enable = 0;
struct omap_overlay *ovl; struct omap_overlay *ovl;

2
include/media/v4l2-ioctl.h
View File

@ -120,7 +120,7 @@ struct v4l2_ioctl_ops {
int (*vidioc_g_fbuf) (struct file *file, void *fh, int (*vidioc_g_fbuf) (struct file *file, void *fh,
struct v4l2_framebuffer *a); struct v4l2_framebuffer *a);
int (*vidioc_s_fbuf) (struct file *file, void *fh, int (*vidioc_s_fbuf) (struct file *file, void *fh,
struct v4l2_framebuffer *a); const struct v4l2_framebuffer *a);
/* Stream on/off */ /* Stream on/off */
int (*vidioc_streamon) (struct file *file, void *fh, enum v4l2_buf_type i); int (*vidioc_streamon) (struct file *file, void *fh, enum v4l2_buf_type i);