openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

media: constify fb ops across all drivers 

Now that the fbops member of struct fb_info is const, we can start
making the ops const as well.

Remove the redundant fbops assignments while at it.

v2:
- actually add const in vivid
- fix typo (Christophe de Dinechin)

Cc: Hans Verkuil <hverkuil@xs4all.nl>
Cc: Andy Walls <awalls@md.metrocast.net>
Cc: linux-media@vger.kernel.org
Cc: ivtv-devel@ivtvdriver.org
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Reviewed-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Acked-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/71794337f8611271f2c1fdb3882119a58e743a87.1575390741.git.jani.nikula@intel.com
This commit is contained in:
Jani Nikula 2019-12-03 18:38:52 +02:00
parent 17cfcb68af
commit 75d18496cf
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/media/pci/ivtv/ivtvfb.c
View File

@ -925,7 +925,7 @@ static int ivtvfb_blank(int blank_mode, struct fb_info *info)
return 0; return 0;
} }
static struct fb_ops ivtvfb_ops = { static const struct fb_ops ivtvfb_ops = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.fb_write = ivtvfb_write, .fb_write = ivtvfb_write,
.fb_check_var = ivtvfb_check_var, .fb_check_var = ivtvfb_check_var,
@ -1049,7 +1049,6 @@ static int ivtvfb_init_vidmode(struct ivtv *itv)
oi->ivtvfb_info.node = -1; oi->ivtvfb_info.node = -1;
oi->ivtvfb_info.flags = FBINFO_FLAG_DEFAULT; oi->ivtvfb_info.flags = FBINFO_FLAG_DEFAULT;
oi->ivtvfb_info.fbops = &ivtvfb_ops;
oi->ivtvfb_info.par = itv; oi->ivtvfb_info.par = itv;
oi->ivtvfb_info.var = oi->ivtvfb_defined; oi->ivtvfb_info.var = oi->ivtvfb_defined;
oi->ivtvfb_info.fix = oi->ivtvfb_fix; oi->ivtvfb_info.fix = oi->ivtvfb_fix;

3
drivers/media/platform/vivid/vivid-osd.c
View File

@ -244,7 +244,7 @@ static int vivid_fb_blank(int blank_mode, struct fb_info *info)
return 0; return 0;
} }
static struct fb_ops vivid_fb_ops = { static const struct fb_ops vivid_fb_ops = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.fb_check_var = vivid_fb_check_var, .fb_check_var = vivid_fb_check_var,
.fb_set_par = vivid_fb_set_par, .fb_set_par = vivid_fb_set_par,
@ -311,7 +311,6 @@ static int vivid_fb_init_vidmode(struct vivid_dev *dev)
dev->fb_info.node = -1; dev->fb_info.node = -1;
dev->fb_info.flags = FBINFO_FLAG_DEFAULT; dev->fb_info.flags = FBINFO_FLAG_DEFAULT;
dev->fb_info.fbops = &vivid_fb_ops;
dev->fb_info.par = dev; dev->fb_info.par = dev;
dev->fb_info.var = dev->fb_defined; dev->fb_info.var = dev->fb_defined;
dev->fb_info.fix = dev->fb_fix; dev->fb_info.fix = dev->fb_fix;