diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-06-28 14:42:20 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-06-28 14:42:20 -0300 |
| commit | 4f2d17789141dd027ea033ac9a6f8b2922bf5a58 (patch) | |
| tree | e121030cc2901336ff9b41f14f1a37138d5965c1 /linux/drivers/media/video/s2255drv.c | |
| parent | 6b35bbed7973468d128122f6fb01c028c8f55904 (diff) | |
| download | mediapointer-dvb-s2-4f2d17789141dd027ea033ac9a6f8b2922bf5a58.tar.gz mediapointer-dvb-s2-4f2d17789141dd027ea033ac9a6f8b2922bf5a58.tar.bz2 | |
Fix callback names
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Callback naming has changed. Fix to the proper convention.
CC: Dean Anderson <dean@sensoray.com>
CC: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/s2255drv.c')
| -rw-r--r-- | linux/drivers/media/video/s2255drv.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/linux/drivers/media/video/s2255drv.c b/linux/drivers/media/video/s2255drv.c index d9abde203..6d5fbad95 100644 --- a/linux/drivers/media/video/s2255drv.c +++ b/linux/drivers/media/video/s2255drv.c @@ -812,7 +812,7 @@ static int vidioc_querycap(struct file *file, void *priv, return 0; } -static int vidioc_enum_fmt_cap(struct file *file, void *priv, +static int vidioc_enum_fmt_vid_cap(struct file *file, void *priv, struct v4l2_fmtdesc *f) { int index = 0; @@ -828,7 +828,7 @@ static int vidioc_enum_fmt_cap(struct file *file, void *priv, return 0; } -static int vidioc_g_fmt_cap(struct file *file, void *priv, +static int vidioc_g_fmt_vid_cap(struct file *file, void *priv, struct v4l2_format *f) { struct s2255_fh *fh = priv; @@ -843,7 +843,7 @@ static int vidioc_g_fmt_cap(struct file *file, void *priv, return (0); } -static int vidioc_try_fmt_cap(struct file *file, void *priv, +static int vidioc_try_fmt_vid_cap(struct file *file, void *priv, struct v4l2_format *f) { const struct s2255_fmt *fmt; @@ -949,7 +949,7 @@ static int vidioc_try_fmt_cap(struct file *file, void *priv, return 0; } -static int vidioc_s_fmt_cap(struct file *file, void *priv, +static int vidioc_s_fmt_vid_cap(struct file *file, void *priv, struct v4l2_format *f) { struct s2255_fh *fh = priv; @@ -958,7 +958,7 @@ static int vidioc_s_fmt_cap(struct file *file, void *priv, int ret; int norm; - ret = vidioc_try_fmt_cap(file, fh, f); + ret = vidioc_try_fmt_vid_cap(file, fh, f); if (ret < 0) return (ret); @@ -1656,10 +1656,10 @@ static struct video_device template = { .minor = -1, .release = video_device_release, .vidioc_querycap = vidioc_querycap, - .vidioc_enum_fmt_cap = vidioc_enum_fmt_cap, - .vidioc_g_fmt_cap = vidioc_g_fmt_cap, - .vidioc_try_fmt_cap = vidioc_try_fmt_cap, - .vidioc_s_fmt_cap = vidioc_s_fmt_cap, + .vidioc_enum_fmt_vid_cap = vidioc_enum_fmt_vid_cap, + .vidioc_g_fmt_vid_cap = vidioc_g_fmt_vid_cap, + .vidioc_try_fmt_vid_cap = vidioc_try_fmt_vid_cap, + .vidioc_s_fmt_vid_cap = vidioc_s_fmt_vid_cap, .vidioc_reqbufs = vidioc_reqbufs, .vidioc_querybuf = vidioc_querybuf, .vidioc_qbuf = vidioc_qbuf, |