]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
fbdev: Rework fb_blank()
authorThomas Zimmermann <tzimmermann@suse.de>
Fri, 21 Mar 2025 09:53:54 +0000 (10:53 +0100)
committerLee Jones <lee@kernel.org>
Thu, 10 Apr 2025 09:38:53 +0000 (10:38 +0100)
Reimplement fb_blank() to return early on errors. No functional
changes. Prepares the helper for tracking the blanking state in
struct fb_info.

Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Acked-by: Simona Vetter <simona.vetter@ffwll.ch>
Link: https://lore.kernel.org/r/20250321095517.313713-2-tzimmermann@suse.de
Signed-off-by: Lee Jones <lee@kernel.org>
drivers/video/fbdev/core/fbmem.c

index 3c568cff2913e4f625333b31906636b732b280a7..39e2b81473ad0d9abfa021e3f1686b1afe8f706d 100644 (file)
@@ -339,11 +339,13 @@ fb_set_var(struct fb_info *info, struct fb_var_screeninfo *var)
 }
 EXPORT_SYMBOL(fb_set_var);
 
-int
-fb_blank(struct fb_info *info, int blank)
+int fb_blank(struct fb_info *info, int blank)
 {
        struct fb_event event;
-       int ret = -EINVAL;
+       int ret;
+
+       if (!info->fbops->fb_blank)
+               return -EINVAL;
 
        if (blank > FB_BLANK_POWERDOWN)
                blank = FB_BLANK_POWERDOWN;
@@ -351,13 +353,13 @@ fb_blank(struct fb_info *info, int blank)
        event.info = info;
        event.data = &blank;
 
-       if (info->fbops->fb_blank)
-               ret = info->fbops->fb_blank(blank, info);
+       ret = info->fbops->fb_blank(blank, info);
+       if (ret)
+               return ret;
 
-       if (!ret)
-               fb_notifier_call_chain(FB_EVENT_BLANK, &event);
+       fb_notifier_call_chain(FB_EVENT_BLANK, &event);
 
-       return ret;
+       return 0;
 }
 EXPORT_SYMBOL(fb_blank);