6.1-stable review patch. If anyone has any objections, please let me know.
------------------ From: Thomas Zimmermann <[email protected]> [ Upstream commit cf683e8870bd4be0fd6b98639286700a35088660 ] Use /* */ in initializer macro to avoid out-commenting the comma at the end of the line. Reported-by: Christian König <[email protected]> Closes: https://lore.kernel.org/dri-devel/[email protected]/T/#m356cda2679c17d7a01f30ce2b5282cd9046ea6d4 Fixes: f1061fa641b8 ("fbdev: Add initializer macros for struct fb_ops") Cc: Sam Ravnborg <[email protected]> Cc: Helge Deller <[email protected]> Cc: [email protected] Cc: [email protected] Signed-off-by: Thomas Zimmermann <[email protected]> Reviewed-by: Christian König <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected] Signed-off-by: Sasha Levin <[email protected]> --- include/linux/fb.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/linux/fb.h b/include/linux/fb.h index 2435aeddf47fa..10844193fb9d8 100644 --- a/include/linux/fb.h +++ b/include/linux/fb.h @@ -621,7 +621,7 @@ extern void cfb_imageblit(struct fb_info *info, const struct fb_image *image); .fb_imageblit = cfb_imageblit #define __FB_DEFAULT_IO_OPS_MMAP \ - .fb_mmap = NULL // default implementation + .fb_mmap = NULL /* default implementation */ #define FB_DEFAULT_IO_OPS \ __FB_DEFAULT_IO_OPS_RDWR, \ @@ -654,7 +654,7 @@ extern ssize_t fb_sys_write(struct fb_info *info, const char __user *buf, .fb_imageblit = sys_imageblit #define __FB_DEFAULT_SYS_OPS_MMAP \ - .fb_mmap = NULL // default implementation + .fb_mmap = NULL /* default implementation */ #define FB_DEFAULT_SYS_OPS \ __FB_DEFAULT_SYS_OPS_RDWR, \ -- 2.53.0
