5 files changed, 121 insertions, 72 deletions

diff --git a/drivers/video/backlight/backlight.c b/drivers/video/backlight/backlight.c
index 1d97cdf6f382..9601bfe309ac 100644
--- a/drivers/video/backlight/backlight.c
+++ b/drivers/video/backlight/backlight.c
@@ -14,6 +14,59 @@
 #include <linux/err.h>
 #include <linux/fb.h>
 
+
+#if defined(CONFIG_FB) || (defined(CONFIG_FB_MODULE) && \
+                           defined(CONFIG_BACKLIGHT_CLASS_DEVICE_MODULE))
+/* This callback gets called when something important happens inside a
+ * framebuffer driver. We're looking if that important event is blanking,
+ * and if it is, we're switching backlight power as well ...
+ */
+static int fb_notifier_callback(struct notifier_block *self,
+                                unsigned long event, void *data)
+{
+        struct backlight_device *bd;
+        struct fb_event *evdata = data;
+
+        /* If we aren't interested in this event, skip it immediately ... */
+        if (event != FB_EVENT_BLANK)
+                return 0;
+
+        bd = container_of(self, struct backlight_device, fb_notif);
+        down(&bd->sem);
+        if (bd->props)
+                if (!bd->props->check_fb ||
+                    bd->props->check_fb(evdata->info)) {
+                        bd->props->fb_blank = *(int *)evdata->data;
+                        if (likely(bd->props && bd->props->update_status))
+                                bd->props->update_status(bd);
+                }
+        up(&bd->sem);
+        return 0;
+}
+
+static int backlight_register_fb(struct backlight_device *bd)
+{
+        memset(&bd->fb_notif, 0, sizeof(bd->fb_notif));
+        bd->fb_notif.notifier_call = fb_notifier_callback;
+
+        return fb_register_client(&bd->fb_notif);
+}
+
+static void backlight_unregister_fb(struct backlight_device *bd)
+{
+        fb_unregister_client(&bd->fb_notif);
+}
+#else
+static inline int backlight_register_fb(struct backlight_device *bd)
+{
+        return 0;
+}
+
+static inline void backlight_unregister_fb(struct backlight_device *bd)
+{
+}
+#endif /* CONFIG_FB */
+
 static ssize_t backlight_show_power(struct class_device *cdev, char *buf)
 {
         int rc = -ENXIO;
@@ -142,7 +195,7 @@ static struct class backlight_class = {
         .store  = _store,                                       \
 }
 
-static struct class_device_attribute bl_class_device_attributes[] = {
+static const struct class_device_attribute bl_class_device_attributes[] = {
         DECLARE_ATTR(power, 0644, backlight_show_power, backlight_store_power),
         DECLARE_ATTR(brightness, 0644, backlight_show_brightness,
                      backlight_store_brightness),
@@ -151,33 +204,6 @@ static struct class_device_attribute bl_class_device_attributes[] = {
         DECLARE_ATTR(max_brightness, 0444, backlight_show_max_brightness, NULL),
 };
 
-/* This callback gets called when something important happens inside a
- * framebuffer driver. We're looking if that important event is blanking,
- * and if it is, we're switching backlight power as well ...
- */
-static int fb_notifier_callback(struct notifier_block *self,
-                                unsigned long event, void *data)
-{
-        struct backlight_device *bd;
-        struct fb_event *evdata =(struct fb_event *)data;
-
-        /* If we aren't interested in this event, skip it immediately ... */
-        if (event != FB_EVENT_BLANK)
-                return 0;
-
-        bd = container_of(self, struct backlight_device, fb_notif);
-        down(&bd->sem);
-        if (bd->props)
-                if (!bd->props->check_fb ||
-                    bd->props->check_fb(evdata->info)) {
-                        bd->props->fb_blank = *(int *)evdata->data;
-                        if (likely(bd->props && bd->props->update_status))
-                                bd->props->update_status(bd);
-                }
-        up(&bd->sem);
-        return 0;
-}
-
 /**
  * backlight_device_register - create and register a new object of
  *   backlight_device class.
@@ -218,10 +244,7 @@ error:		kfree(new_bd);
                 return ERR_PTR(rc);
         }
 
-        memset(&new_bd->fb_notif, 0, sizeof(new_bd->fb_notif));
-        new_bd->fb_notif.notifier_call = fb_notifier_callback;
-
-        rc = fb_register_client(&new_bd->fb_notif);
+        rc = backlight_register_fb(new_bd);
         if (unlikely(rc))
                 goto error;
 
@@ -262,16 +285,10 @@ void backlight_device_unregister(struct backlight_device *bd)
                                          &bl_class_device_attributes[i]);
 
         down(&bd->sem);
-        if (likely(bd->props && bd->props->update_status)) {
-                bd->props->brightness = 0;
-                bd->props->power = 0;
-                bd->props->update_status(bd);
-        }
-
         bd->props = NULL;
         up(&bd->sem);
 
-        fb_unregister_client(&bd->fb_notif);
+        backlight_unregister_fb(bd);
 
         class_device_unregister(&bd->class_dev);
 }
diff --git a/drivers/video/backlight/corgi_bl.c b/drivers/video/backlight/corgi_bl.c
index 2ebbfd95145f..61587ca2cdbb 100644
--- a/drivers/video/backlight/corgi_bl.c
+++ b/drivers/video/backlight/corgi_bl.c
@@ -111,7 +111,7 @@ static struct backlight_properties corgibl_data = {
         .update_status  = corgibl_set_intensity,
 };
 
-static int __init corgibl_probe(struct platform_device *pdev)
+static int corgibl_probe(struct platform_device *pdev)
 {
         struct corgibl_machinfo *machinfo = pdev->dev.platform_data;
 
@@ -135,6 +135,10 @@ static int __init corgibl_probe(struct platform_device *pdev)
 
 static int corgibl_remove(struct platform_device *dev)
 {
+        corgibl_data.power = 0;
+        corgibl_data.brightness = 0;
+        corgibl_send_intensity(corgi_backlight_device);
+
         backlight_device_unregister(corgi_backlight_device);
 
         printk("Corgi Backlight Driver Unloaded\n");
@@ -166,4 +170,4 @@ module_exit(corgibl_exit);
 
 MODULE_AUTHOR("Richard Purdie <rpurdie@rpsys.net>");
 MODULE_DESCRIPTION("Corgi Backlight Driver");
-MODULE_LICENSE("GPLv2");
+MODULE_LICENSE("GPL");
diff --git a/drivers/video/backlight/hp680_bl.c b/drivers/video/backlight/hp680_bl.c
index fe1488374f62..1c569fb543ae 100644
--- a/drivers/video/backlight/hp680_bl.c
+++ b/drivers/video/backlight/hp680_bl.c
@@ -19,7 +19,7 @@
 #include <linux/backlight.h>
 
 #include <asm/cpu/dac.h>
-#include <asm/hp6xx/hp6xx.h>
+#include <asm/hp6xx.h>
 #include <asm/hd64461.h>
 
 #define HP680_MAX_INTENSITY 255
@@ -117,6 +117,10 @@ static int __init hp680bl_probe(struct platform_device *dev)
 
 static int hp680bl_remove(struct platform_device *dev)
 {
+        hp680bl_data.brightness = 0;
+        hp680bl_data.power = 0;
+        hp680bl_send_intensity(hp680_backlight_device);
+
         backlight_device_unregister(hp680_backlight_device);
 
         return 0;
diff --git a/drivers/video/backlight/lcd.c b/drivers/video/backlight/lcd.c
index bc8ab005a3fb..f6e041627edb 100644
--- a/drivers/video/backlight/lcd.c
+++ b/drivers/video/backlight/lcd.c
@@ -14,6 +14,53 @@
 #include <linux/err.h>
 #include <linux/fb.h>
 
+#if defined(CONFIG_FB) || (defined(CONFIG_FB_MODULE) && \
+                           defined(CONFIG_LCD_CLASS_DEVICE_MODULE))
+/* This callback gets called when something important happens inside a
+ * framebuffer driver. We're looking if that important event is blanking,
+ * and if it is, we're switching lcd power as well ...
+ */
+static int fb_notifier_callback(struct notifier_block *self,
+                                 unsigned long event, void *data)
+{
+        struct lcd_device *ld;
+        struct fb_event *evdata = data;
+
+        /* If we aren't interested in this event, skip it immediately ... */
+        if (event != FB_EVENT_BLANK)
+                return 0;
+
+        ld = container_of(self, struct lcd_device, fb_notif);
+        down(&ld->sem);
+        if (ld->props)
+                if (!ld->props->check_fb || ld->props->check_fb(evdata->info))
+                        ld->props->set_power(ld, *(int *)evdata->data);
+        up(&ld->sem);
+        return 0;
+}
+
+static int lcd_register_fb(struct lcd_device *ld)
+{
+        memset(&ld->fb_notif, 0, sizeof(&ld->fb_notif));
+        ld->fb_notif.notifier_call = fb_notifier_callback;
+        return fb_register_client(&ld->fb_notif);
+}
+
+static void lcd_unregister_fb(struct lcd_device *ld)
+{
+        fb_unregister_client(&ld->fb_notif);
+}
+#else
+static int lcd_register_fb(struct lcd_device *ld)
+{
+        return 0;
+}
+
+static inline void lcd_unregister_fb(struct lcd_device *ld)
+{
+}
+#endif /* CONFIG_FB */
+
 static ssize_t lcd_show_power(struct class_device *cdev, char *buf)
 {
         int rc;
@@ -121,35 +168,12 @@ static struct class lcd_class = {
         .store  = _store,                                       \
 }
 
-static struct class_device_attribute lcd_class_device_attributes[] = {
+static const struct class_device_attribute lcd_class_device_attributes[] = {
         DECLARE_ATTR(power, 0644, lcd_show_power, lcd_store_power),
         DECLARE_ATTR(contrast, 0644, lcd_show_contrast, lcd_store_contrast),
         DECLARE_ATTR(max_contrast, 0444, lcd_show_max_contrast, NULL),
 };
 
-/* This callback gets called when something important happens inside a
- * framebuffer driver. We're looking if that important event is blanking,
- * and if it is, we're switching lcd power as well ...
- */
-static int fb_notifier_callback(struct notifier_block *self,
-                                 unsigned long event, void *data)
-{
-        struct lcd_device *ld;
-        struct fb_event *evdata =(struct fb_event *)data;
-
-        /* If we aren't interested in this event, skip it immediately ... */
-        if (event != FB_EVENT_BLANK)
-                return 0;
-
-        ld = container_of(self, struct lcd_device, fb_notif);
-        down(&ld->sem);
-        if (ld->props)
-                if (!ld->props->check_fb || ld->props->check_fb(evdata->info))
-                        ld->props->set_power(ld, *(int *)evdata->data);
-        up(&ld->sem);
-        return 0;
-}
-
 /**
  * lcd_device_register - register a new object of lcd_device class.
  * @name: the name of the new object(must be the same as the name of the
@@ -186,10 +210,8 @@ error:		kfree(new_ld);
                 return ERR_PTR(rc);
         }
 
-        memset(&new_ld->fb_notif, 0, sizeof(new_ld->fb_notif));
-        new_ld->fb_notif.notifier_call = fb_notifier_callback;
+        rc = lcd_register_fb(new_ld);
 
-        rc = fb_register_client(&new_ld->fb_notif);
         if (unlikely(rc))
                 goto error;
 
@@ -232,9 +254,7 @@ void lcd_device_unregister(struct lcd_device *ld)
         down(&ld->sem);
         ld->props = NULL;
         up(&ld->sem);
-
-        fb_unregister_client(&ld->fb_notif);
-
+        lcd_unregister_fb(ld);
         class_device_unregister(&ld->class_dev);
 }
 EXPORT_SYMBOL(lcd_device_unregister);
diff --git a/drivers/video/backlight/locomolcd.c b/drivers/video/backlight/locomolcd.c
index 628571c63bac..2d7905410b2a 100644
--- a/drivers/video/backlight/locomolcd.c
+++ b/drivers/video/backlight/locomolcd.c
@@ -200,6 +200,10 @@ static int locomolcd_remove(struct locomo_dev *dev)
 {
         unsigned long flags;
 
+        locomobl_data.brightness = 0;
+        locomobl_data.power = 0;
+        locomolcd_set_intensity(locomolcd_bl_device);
+
         backlight_device_unregister(locomolcd_bl_device);
         local_irq_save(flags);
         locomolcd_dev = NULL;