6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Thomas Zimmermann <tzimmermann@xxxxxxx>
[ Upstream commit 12d55c013a09a2d490f004a324c20800e4ff35ec ]
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@xxxxxxx>
Fixes: 586132cf1d38 ("fbdev/sm712fb: Initialize fb_ops to fbdev I/O-memory helpers")
Cc: Thomas Zimmermann <tzimmermann@xxxxxxx>
Cc: Javier Martinez Canillas <javierm@xxxxxxxxxx>
Cc: Sudip Mukherjee <sudipm.mukherjee@xxxxxxxxx>
Cc: Teddy Wang <teddy.wang@xxxxxxxxxxxxxxxxx>
Cc: Sam Ravnborg <sam@xxxxxxxxxxxx>
Cc: Helge Deller <deller@xxxxxx>
Cc: Arnd Bergmann <arnd@xxxxxxxx>
Cc: linux-fbdev@xxxxxxxxxxxxxxx
Reviewed-by: Javier Martinez Canillas <javierm@xxxxxxxxxx>
Link: https://patchwork.freedesktop.org/patch/msgid/20231127131655.4020-3-tzimmermann@xxxxxxx
Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>
---
drivers/video/fbdev/sm712fb.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/drivers/video/fbdev/sm712fb.c b/drivers/video/fbdev/sm712fb.c
index 3f8ef50e3209..104f122e0f27 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,
};
/*
--
2.43.0
