| Message ID | 20231115102954.7102-3-tzimmermann@suse.de (mailing list archive) |
|---|---|
| State | Handled Elsewhere |
| Headers | show |
| Series | fbdev: Modularize helpers for struct fb_ops | expand |
Thomas Zimmermann <tzimmermann@suse.de> writes: > Only initialize mmap and draw helpers with macros; leave read/write > callbacks to driver implementations. Fixes the following warnings: > > CC [M] drivers/video/fbdev/sm712fb.o > sm712fb.c:1355:25: warning: initialized field overwritten [-Woverride-init] > 1355 | .fb_fillrect = cfb_fillrect, > | ^~~~~~~~~~~~ > sm712fb.c:1355:25: note: (near initialization for 'smtcfb_ops.fb_fillrect') > sm712fb.c:1356:25: warning: initialized field overwritten [-Woverride-init] > 1356 | .fb_imageblit = cfb_imageblit, > | ^~~~~~~~~~~~~ > sm712fb.c:1356:25: note: (near initialization for 'smtcfb_ops.fb_imageblit') > sm712fb.c:1357:25: warning: initialized field overwritten [-Woverride-init] > 1357 | .fb_copyarea = cfb_copyarea, > | ^~~~~~~~~~~~ > sm712fb.c:1357:25: note: (near initialization for 'smtcfb_ops.fb_copyarea') > sm712fb.c:1358:25: warning: initialized field overwritten [-Woverride-init] > 1358 | .fb_read = smtcfb_read, > | ^~~~~~~~~~~ > sm712fb.c:1358:25: note: (near initialization for 'smtcfb_ops.fb_read') > sm712fb.c:1359:25: warning: initialized field overwritten [-Woverride-init] > 1359 | .fb_write = smtcfb_write, > | ^~~~~~~~~~~~ > sm712fb.c:1359:25: note: (near initialization for 'smtcfb_ops.fb_write') > > Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de> > Fixes: 586132cf1d38 ("fbdev/sm712fb: Initialize fb_ops to fbdev I/O-memory helpers") > Cc: Thomas Zimmermann <tzimmermann@suse.de> > Cc: Javier Martinez Canillas <javierm@redhat.com> > Cc: Sudip Mukherjee <sudipm.mukherjee@gmail.com> > Cc: Teddy Wang <teddy.wang@siliconmotion.com> > Cc: Sam Ravnborg <sam@ravnborg.org> > Cc: Helge Deller <deller@gmx.de> > Cc: Arnd Bergmann <arnd@arndb.de> > Cc: linux-fbdev@vger.kernel.org > --- > drivers/video/fbdev/sm712fb.c | 6 ++---- > 1 file changed, 2 insertions(+), 4 deletions(-) > Reviewed-by: Javier Martinez Canillas <javierm@redhat.com>
diff --git a/drivers/video/fbdev/sm712fb.c b/drivers/video/fbdev/sm712fb.c index 3f8ef50e32095..104f122e0f273 100644 --- a/drivers/video/fbdev/sm712fb.c +++ b/drivers/video/fbdev/sm712fb.c @@ -1347,16 +1347,14 @@ static int smtc_set_par(struct fb_info *info) static const struct fb_ops smtcfb_ops = { .owner = THIS_MODULE, - FB_DEFAULT_IOMEM_OPS, .fb_check_var = smtc_check_var, .fb_set_par = smtc_set_par, .fb_setcolreg = smtc_setcolreg, .fb_blank = smtc_blank, - .fb_fillrect = cfb_fillrect, - .fb_imageblit = cfb_imageblit, - .fb_copyarea = cfb_copyarea, + __FB_DEFAULT_IOMEM_OPS_DRAW, .fb_read = smtcfb_read, .fb_write = smtcfb_write, + __FB_DEFAULT_IOMEM_OPS_MMAP, }; /*
Only initialize mmap and draw helpers with macros; leave read/write callbacks to driver implementations. Fixes the following warnings: CC [M] drivers/video/fbdev/sm712fb.o sm712fb.c:1355:25: warning: initialized field overwritten [-Woverride-init] 1355 | .fb_fillrect = cfb_fillrect, | ^~~~~~~~~~~~ sm712fb.c:1355:25: note: (near initialization for 'smtcfb_ops.fb_fillrect') sm712fb.c:1356:25: warning: initialized field overwritten [-Woverride-init] 1356 | .fb_imageblit = cfb_imageblit, | ^~~~~~~~~~~~~ sm712fb.c:1356:25: note: (near initialization for 'smtcfb_ops.fb_imageblit') sm712fb.c:1357:25: warning: initialized field overwritten [-Woverride-init] 1357 | .fb_copyarea = cfb_copyarea, | ^~~~~~~~~~~~ sm712fb.c:1357:25: note: (near initialization for 'smtcfb_ops.fb_copyarea') sm712fb.c:1358:25: warning: initialized field overwritten [-Woverride-init] 1358 | .fb_read = smtcfb_read, | ^~~~~~~~~~~ sm712fb.c:1358:25: note: (near initialization for 'smtcfb_ops.fb_read') sm712fb.c:1359:25: warning: initialized field overwritten [-Woverride-init] 1359 | .fb_write = smtcfb_write, | ^~~~~~~~~~~~ sm712fb.c:1359:25: note: (near initialization for 'smtcfb_ops.fb_write') Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de> Fixes: 586132cf1d38 ("fbdev/sm712fb: Initialize fb_ops to fbdev I/O-memory helpers") Cc: Thomas Zimmermann <tzimmermann@suse.de> Cc: Javier Martinez Canillas <javierm@redhat.com> Cc: Sudip Mukherjee <sudipm.mukherjee@gmail.com> Cc: Teddy Wang <teddy.wang@siliconmotion.com> Cc: Sam Ravnborg <sam@ravnborg.org> Cc: Helge Deller <deller@gmx.de> Cc: Arnd Bergmann <arnd@arndb.de> Cc: linux-fbdev@vger.kernel.org --- drivers/video/fbdev/sm712fb.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)