backlight: drop EARLY_EVENT_BLANK support

There was no users left - so drop the code to support EARLY_EVENT_BLANK.
This patch removes the support in backlight,
and drop the notifier in fbmem.

That EARLY_EVENT_BLANK is not used can be verified that no driver set any of:

    lcd_ops.early_set_power()
    lcd_ops.r_early_set_power()

Noticed while browsing backlight code for other reasons.

v2:
- Fix changelog to say "EARLY_EVENT_BLANK" (Daniel)

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Cc: Lee Jones <lee.jones@linaro.org>
Cc: Daniel Thompson <daniel.thompson@linaro.org>
Cc: Jingoo Han <jingoohan1@gmail.com>
Cc: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Sam Ravnborg <sam@ravnborg.org>
Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Cc: "Michał Mirosław" <mirq-linux@rere.qmqm.pl>
Cc: Peter Rosin <peda@axentia.se>
Cc: Gerd Hoffmann <kraxel@redhat.com>
Cc: dri-devel@lists.freedesktop.org
Cc: linux-fbdev@vger.kernel.org
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Acked-by: Daniel Thompson <daniel.thompson@linaro.org>
Acked-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Acked-by: Lee Jones <lee.jones@linaro.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20190725143224.GB31803@ravnborg.org

diff --git a/drivers/video/backlight/lcd.c b/drivers/video/backlight/lcd.c
index d6b653aa4ee91d499acff47fe3356055f8f831f4..78b033358625808d1e108892d788c6081dc1b339 100644 (file)
--- a/drivers/video/backlight/lcd.c
+++ b/drivers/video/backlight/lcd.c
@@ -39,14 +39,6 @@ static int fb_notifier_callback(struct notifier_block *self,
                if (event == FB_EVENT_BLANK) {
                        if (ld->ops->set_power)
                                ld->ops->set_power(ld, *(int *)evdata->data);
-               } else if (event == FB_EARLY_EVENT_BLANK) {
-                       if (ld->ops->early_set_power)
-                               ld->ops->early_set_power(ld,
-                                               *(int *)evdata->data);
-               } else if (event == FB_R_EARLY_EVENT_BLANK) {
-                       if (ld->ops->r_early_set_power)
-                               ld->ops->r_early_set_power(ld,
-                                               *(int *)evdata->data);
                } else {
                        if (ld->ops->set_mode)
                                ld->ops->set_mode(ld, evdata->data);

diff --git a/drivers/video/fbdev/core/fbmem.c b/drivers/video/fbdev/core/fbmem.c
index 00fe0efeaee9e4f44f0ee125585da8e12872191d..e6a1c805064f07c8ae2499c3a2f9e0a069546999 100644 (file)
--- a/drivers/video/fbdev/core/fbmem.c
+++ b/drivers/video/fbdev/core/fbmem.c
@@ -1058,7 +1058,7 @@ int
 fb_blank(struct fb_info *info, int blank)
 {      
        struct fb_event event;
-       int ret = -EINVAL, early_ret;
+       int ret = -EINVAL;
 
        if (blank > FB_BLANK_POWERDOWN)
                blank = FB_BLANK_POWERDOWN;
@@ -1066,21 +1066,11 @@ fb_blank(struct fb_info *info, int blank)
        event.info = info;
        event.data = ␣
 
-       early_ret = fb_notifier_call_chain(FB_EARLY_EVENT_BLANK, &event);
-
        if (info->fbops->fb_blank)
                ret = info->fbops->fb_blank(blank, info);
 
        if (!ret)
                fb_notifier_call_chain(FB_EVENT_BLANK, &event);
-       else {
-               /*
-                * if fb_blank is failed then revert effects of
-                * the early blank event.
-                */
-               if (!early_ret)
-                       fb_notifier_call_chain(FB_R_EARLY_EVENT_BLANK, &event);
-       }
 
        return ret;
 }

diff --git a/include/linux/fb.h b/include/linux/fb.h
index 50948e51989748c6d486711910c60ad4fbf3d9f1..756706b666a109fa8718df5f75fb2dc3b58bc0b8 100644 (file)
--- a/include/linux/fb.h
+++ b/include/linux/fb.h
@@ -135,10 +135,6 @@ struct fb_cursor_user {
 
 /*      A display blank is requested       */
 #define FB_EVENT_BLANK                  0x09
-/*      A hardware display blank early change occurred */
-#define FB_EARLY_EVENT_BLANK           0x10
-/*      A hardware display blank revert early change occurred */
-#define FB_R_EARLY_EVENT_BLANK         0x11
 
 struct fb_event {
        struct fb_info *info;

diff --git a/include/linux/lcd.h b/include/linux/lcd.h
index 851eee8fff257836c06ed5b8b7f4ddb7d0e87e2a..238fb1dfed98d9b16dd85789c25e3326fa8e30d9 100644 (file)
--- a/include/linux/lcd.h
+++ b/include/linux/lcd.h
@@ -41,16 +41,6 @@ struct lcd_ops {
        /* Get the LCD panel power status (0: full on, 1..3: controller
           power on, flat panel power off, 4: full off), see FB_BLANK_XXX */
        int (*get_power)(struct lcd_device *);
-       /*
-        * Enable or disable power to the LCD(0: on; 4: off, see FB_BLANK_XXX)
-        * and this callback would be called proir to fb driver's callback.
-        *
-        * P.S. note that if early_set_power is not NULL then early fb notifier
-        *      would be registered.
-        */
-       int (*early_set_power)(struct lcd_device *, int power);
-       /* revert the effects of the early blank event. */
-       int (*r_early_set_power)(struct lcd_device *, int power);
        /* Enable or disable power to the LCD (0: on; 4: off, see FB_BLANK_XXX) */
        int (*set_power)(struct lcd_device *, int power);
        /* Get the current contrast setting (0-max_contrast) */