Merge branch 'for-3.5-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj...

[firefly-linux-kernel-4.4.55.git] / drivers / video / backlight / lcd.c

diff --git a/drivers/video/backlight/lcd.c b/drivers/video/backlight/lcd.c
index 79c1b0d609a809e189f43515ee20f648a7d2e8fa..a5d0d024bb92939ec9cdefbd6788febabebfb337 100644 (file)
--- a/drivers/video/backlight/lcd.c
+++ b/drivers/video/backlight/lcd.c
@@ -5,6 +5,8 @@
  *
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/device.h>
@@ -32,6 +34,8 @@ static int fb_notifier_callback(struct notifier_block *self,
        case FB_EVENT_BLANK:
        case FB_EVENT_MODE_CHANGE:
        case FB_EVENT_MODE_CHANGE_ALL:
+       case FB_EARLY_EVENT_BLANK:
+       case FB_R_EARLY_EVENT_BLANK:
                break;
        default:
                return 0;
@@ -46,6 +50,14 @@ 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);
@@ -106,7 +118,7 @@ static ssize_t lcd_store_power(struct device *dev,
 
        mutex_lock(&ld->ops_lock);
        if (ld->ops && ld->ops->set_power) {
-               pr_debug("lcd: set power to %lu\n", power);
+               pr_debug("set power to %lu\n", power);
                ld->ops->set_power(ld, power);
                rc = count;
        }
@@ -142,7 +154,7 @@ static ssize_t lcd_store_contrast(struct device *dev,
 
        mutex_lock(&ld->ops_lock);
        if (ld->ops && ld->ops->set_contrast) {
-               pr_debug("lcd: set contrast to %lu\n", contrast);
+               pr_debug("set contrast to %lu\n", contrast);
                ld->ops->set_contrast(ld, contrast);
                rc = count;
        }
@@ -253,8 +265,8 @@ static int __init lcd_class_init(void)
 {
        lcd_class = class_create(THIS_MODULE, "lcd");
        if (IS_ERR(lcd_class)) {
-               printk(KERN_WARNING "Unable to create backlight class; errno = %ld\n",
-                               PTR_ERR(lcd_class));
+               pr_warn("Unable to create backlight class; errno = %ld\n",
+                       PTR_ERR(lcd_class));
                return PTR_ERR(lcd_class);
        }