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 <tzimmerm...@suse.de>
---
 drivers/video/fbdev/core/fbmem.c | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/drivers/video/fbdev/core/fbmem.c b/drivers/video/fbdev/core/fbmem.c
index 3c568cff2913..39e2b81473ad 100644
--- a/drivers/video/fbdev/core/fbmem.c
+++ b/drivers/video/fbdev/core/fbmem.c
@@ -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);
 
-- 
2.48.1

Reply via email to