backlight: Separate backlight properties from backlight ops pointers

[linux-2.6-block.git] / drivers / video / chipsfb.c

diff --git a/drivers/video/chipsfb.c b/drivers/video/chipsfb.c
index 0e465c80ef241f261e7948425eca67c82d1a60a4..af313bf1a2da04d7feccf9211e446c6f0303cfb7 100644 (file)
--- a/drivers/video/chipsfb.c
+++ b/drivers/video/chipsfb.c
@@ -19,7 +19,6 @@
 #include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/mm.h>
-#include <linux/tty.h>
 #include <linux/slab.h>
 #include <linux/vmalloc.h>
 #include <linux/delay.h>
@@ -146,27 +145,6 @@ static int chipsfb_set_par(struct fb_info *info)
 
 static int chipsfb_blank(int blank, struct fb_info *info)
 {
-#ifdef CONFIG_PMAC_BACKLIGHT
-       mutex_lock(&pmac_backlight_mutex);
-
-       if (pmac_backlight) {
-               down(&pmac_backlight->sem);
-
-               /* used to disable backlight only for blank > 1, but it seems
-                * useful at blank = 1 too (saves battery, extends backlight
-                * life)
-                */
-               if (blank)
-                       pmac_backlight->props->power = FB_BLANK_POWERDOWN;
-               else
-                       pmac_backlight->props->power = FB_BLANK_UNBLANK;
-               pmac_backlight->props->update_status(pmac_backlight);
-               up(&pmac_backlight->sem);
-       }
-
-       mutex_unlock(&pmac_backlight_mutex);
-#endif /* CONFIG_PMAC_BACKLIGHT */
-
        return 1;       /* get fb_blank to set the colormap to all black */
 }
 
@@ -417,10 +395,8 @@ chipsfb_pci_init(struct pci_dev *dp, const struct pci_device_id *ent)
        /* turn on the backlight */
        mutex_lock(&pmac_backlight_mutex);
        if (pmac_backlight) {
-               down(&pmac_backlight->sem);
-               pmac_backlight->props->power = FB_BLANK_UNBLANK;
-               pmac_backlight->props->update_status(pmac_backlight);
-               up(&pmac_backlight->sem);
+               pmac_backlight->props.power = FB_BLANK_UNBLANK;
+               backlight_update_status(pmac_backlight);
        }
        mutex_unlock(&pmac_backlight_mutex);
 #endif /* CONFIG_PMAC_BACKLIGHT */