Merge tag 'backlight-for-linus-3.17' of git://git.kernel.org/pub/scm/linux/kernel...

[cascardo/linux.git] / drivers / video / backlight / backlight.c

diff --git a/drivers/video/backlight/backlight.c b/drivers/video/backlight/backlight.c
index bd2172c..bddc8b1 100644 (file)
--- a/drivers/video/backlight/backlight.c
+++ b/drivers/video/backlight/backlight.c
@@ -23,6 +23,7 @@
 
 static struct list_head backlight_dev_list;
 static struct mutex backlight_dev_list_mutex;
+static struct blocking_notifier_head backlight_notifier;
 
 static const char *const backlight_types[] = {
        [BACKLIGHT_RAW] = "raw",
@@ -222,6 +223,8 @@ static ssize_t actual_brightness_show(struct device *dev,
        mutex_lock(&bd->ops_lock);
        if (bd->ops && bd->ops->get_brightness)
                rc = sprintf(buf, "%d\n", bd->ops->get_brightness(bd));
+       else
+               rc = sprintf(buf, "%d\n", bd->props.brightness);
        mutex_unlock(&bd->ops_lock);
 
        return rc;
@@ -370,6 +373,9 @@ struct backlight_device *backlight_device_register(const char *name,
        list_add(&new_bd->entry, &backlight_dev_list);
        mutex_unlock(&backlight_dev_list_mutex);
 
+       blocking_notifier_call_chain(&backlight_notifier,
+                                    BACKLIGHT_REGISTERED, new_bd);
+
        return new_bd;
 }
 EXPORT_SYMBOL(backlight_device_register);
@@ -413,6 +419,10 @@ void backlight_device_unregister(struct backlight_device *bd)
                pmac_backlight = NULL;
        mutex_unlock(&pmac_backlight_mutex);
 #endif
+
+       blocking_notifier_call_chain(&backlight_notifier,
+                                    BACKLIGHT_UNREGISTERED, bd);
+
        mutex_lock(&bd->ops_lock);
        bd->ops = NULL;
        mutex_unlock(&bd->ops_lock);
@@ -437,6 +447,36 @@ static int devm_backlight_device_match(struct device *dev, void *res,
        return *r == data;
 }
 
+/**
+ * backlight_register_notifier - get notified of backlight (un)registration
+ * @nb: notifier block with the notifier to call on backlight (un)registration
+ *
+ * @return 0 on success, otherwise a negative error code
+ *
+ * Register a notifier to get notified when backlight devices get registered
+ * or unregistered.
+ */
+int backlight_register_notifier(struct notifier_block *nb)
+{
+       return blocking_notifier_chain_register(&backlight_notifier, nb);
+}
+EXPORT_SYMBOL(backlight_register_notifier);
+
+/**
+ * backlight_unregister_notifier - unregister a backlight notifier
+ * @nb: notifier block to unregister
+ *
+ * @return 0 on success, otherwise a negative error code
+ *
+ * Register a notifier to get notified when backlight devices get registered
+ * or unregistered.
+ */
+int backlight_unregister_notifier(struct notifier_block *nb)
+{
+       return blocking_notifier_chain_unregister(&backlight_notifier, nb);
+}
+EXPORT_SYMBOL(backlight_unregister_notifier);
+
 /**
  * devm_backlight_device_register - resource managed backlight_device_register()
  * @dev: the device to register
@@ -544,6 +584,8 @@ static int __init backlight_class_init(void)
        backlight_class->pm = &backlight_class_dev_pm_ops;
        INIT_LIST_HEAD(&backlight_dev_list);
        mutex_init(&backlight_dev_list_mutex);
+       BLOCKING_INIT_NOTIFIER_HEAD(&backlight_notifier);
+
        return 0;
 }