Skip to content

Commit 93e41f9

Browse files
Thomas Zimmermannlag-linaro
authored andcommitted
fbdev: Rework fb_blank()
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>
1 parent 0af2f6b commit 93e41f9

File tree

1 file changed

+10
-8
lines changed

1 file changed

+10
-8
lines changed

drivers/video/fbdev/core/fbmem.c

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -339,25 +339,27 @@ fb_set_var(struct fb_info *info, struct fb_var_screeninfo *var)
339339
}
340340
EXPORT_SYMBOL(fb_set_var);
341341

342-
int
343-
fb_blank(struct fb_info *info, int blank)
342+
int fb_blank(struct fb_info *info, int blank)
344343
{
345344
struct fb_event event;
346-
int ret = -EINVAL;
345+
int ret;
346+
347+
if (!info->fbops->fb_blank)
348+
return -EINVAL;
347349

348350
if (blank > FB_BLANK_POWERDOWN)
349351
blank = FB_BLANK_POWERDOWN;
350352

351353
event.info = info;
352354
event.data = &blank;
353355

354-
if (info->fbops->fb_blank)
355-
ret = info->fbops->fb_blank(blank, info);
356+
ret = info->fbops->fb_blank(blank, info);
357+
if (ret)
358+
return ret;
356359

357-
if (!ret)
358-
fb_notifier_call_chain(FB_EVENT_BLANK, &event);
360+
fb_notifier_call_chain(FB_EVENT_BLANK, &event);
359361

360-
return ret;
362+
return 0;
361363
}
362364
EXPORT_SYMBOL(fb_blank);
363365

0 commit comments

Comments
 (0)