backlight: Fix external uses of backlight internal semaphore

backlight_device->sem has a very specific use as documented in the
header file. The external users of this are using it for a different
reason, to serialise access to the update_status() method.

backlight users were supposed to implement their own internal
serialisation of update_status() if needed but everyone is doing
things differently and incorrectly. Therefore add a global mutex to
take care of serialisation for everyone, once and for all.

Locking for get_brightness remains optional since most users don't
need it.

Also update the lcd class in a similar way.

Signed-off-by: Richard Purdie <rpurdie@rpsys.net>

8 files changed, 12 insertions, 35 deletions

diff --git a/drivers/video/aty/aty128fb.c b/drivers/video/aty/aty128fb.c
index 1fa211c0d7bb..5d8f73b2b66f 100644
--- a/drivers/video/aty/aty128fb.c
+++ b/drivers/video/aty/aty128fb.c
@@ -1807,10 +1807,8 @@ static void aty128_bl_set_power(struct fb_info *info, int power)
         mutex_lock(&info->bl_mutex);
 
         if (info->bl_dev) {
-                down(&info->bl_dev->sem);
                 info->bl_dev->props->power = power;
                 __aty128_bl_update_status(info->bl_dev);
-                up(&info->bl_dev->sem);
         }
 
         mutex_unlock(&info->bl_mutex);
@@ -1847,11 +1845,9 @@ static void aty128_bl_init(struct aty128fb_par *par)
                 219 * FB_BACKLIGHT_MAX / MAX_LEVEL);
         mutex_unlock(&info->bl_mutex);
 
-        down(&bd->sem);
         bd->props->brightness = aty128_bl_data.max_brightness;
         bd->props->power = FB_BLANK_UNBLANK;
-        bd->props->update_status(bd);
-        up(&bd->sem);
+        backlight_update_status(bd);
 
 #ifdef CONFIG_PMAC_BACKLIGHT
         mutex_lock(&pmac_backlight_mutex);
diff --git a/drivers/video/aty/atyfb_base.c b/drivers/video/aty/atyfb_base.c
index 5ea5a00e58a3..23deb3566020 100644
--- a/drivers/video/aty/atyfb_base.c
+++ b/drivers/video/aty/atyfb_base.c
@@ -2188,10 +2188,8 @@ static void aty_bl_set_power(struct fb_info *info, int power)
         mutex_lock(&info->bl_mutex);
 
         if (info->bl_dev) {
-                down(&info->bl_dev->sem);
                 info->bl_dev->props->power = power;
                 __aty_bl_update_status(info->bl_dev);
-                up(&info->bl_dev->sem);
         }
 
         mutex_unlock(&info->bl_mutex);
@@ -2224,11 +2222,9 @@ static void aty_bl_init(struct atyfb_par *par)
                 0xFF * FB_BACKLIGHT_MAX / MAX_LEVEL);
         mutex_unlock(&info->bl_mutex);
 
-        down(&bd->sem);
         bd->props->brightness = aty_bl_data.max_brightness;
         bd->props->power = FB_BLANK_UNBLANK;
-        bd->props->update_status(bd);
-        up(&bd->sem);
+        backlight_update_status(bd);
 
 #ifdef CONFIG_PMAC_BACKLIGHT
         mutex_lock(&pmac_backlight_mutex);
diff --git a/drivers/video/aty/radeon_backlight.c b/drivers/video/aty/radeon_backlight.c
index 8b66df6f199a..9cfcecac8b5e 100644
--- a/drivers/video/aty/radeon_backlight.c
+++ b/drivers/video/aty/radeon_backlight.c
@@ -194,11 +194,9 @@ void radeonfb_bl_init(struct radeonfb_info *rinfo)
                 217 * FB_BACKLIGHT_MAX / MAX_RADEON_LEVEL);
         mutex_unlock(&rinfo->info->bl_mutex);
 
-        down(&bd->sem);
         bd->props->brightness = radeon_bl_data.max_brightness;
         bd->props->power = FB_BLANK_UNBLANK;
-        bd->props->update_status(bd);
-        up(&bd->sem);
+        backlight_update_status(bd);
 
 #ifdef CONFIG_PMAC_BACKLIGHT
         mutex_lock(&pmac_backlight_mutex);
diff --git a/drivers/video/backlight/backlight.c b/drivers/video/backlight/backlight.c
index 7a85be4d2b0a..347081daf7a4 100644
--- a/drivers/video/backlight/backlight.c
+++ b/drivers/video/backlight/backlight.c
@@ -37,8 +37,7 @@ static int fb_notifier_callback(struct notifier_block *self,
                 if (!bd->props->check_fb ||
                     bd->props->check_fb(evdata->info)) {
                         bd->props->fb_blank = *(int *)evdata->data;
-                        if (bd->props && bd->props->update_status)
-                                bd->props->update_status(bd);
+                        backlight_update_status(bd);
                 }
         up(&bd->sem);
         return 0;
@@ -97,8 +96,7 @@ static ssize_t backlight_store_power(struct class_device *cdev, const char *buf,
         if (bd->props) {
                 pr_debug("backlight: set power to %d\n", power);
                 bd->props->power = power;
-                if (bd->props->update_status)
-                        bd->props->update_status(bd);
+                backlight_update_status(bd);
                 rc = count;
         }
         up(&bd->sem);
@@ -140,8 +138,7 @@ static ssize_t backlight_store_brightness(struct class_device *cdev, const char
                         pr_debug("backlight: set brightness to %d\n",
                                  brightness);
                         bd->props->brightness = brightness;
-                        if (bd->props->update_status)
-                                bd->props->update_status(bd);
+                        backlight_update_status(bd);
                         rc = count;
                 }
         }
@@ -230,6 +227,7 @@ struct backlight_device *backlight_device_register(const char *name,
         if (!new_bd)
                 return ERR_PTR(-ENOMEM);
 
+        mutex_init(&new_bd->update_lock);
         init_MUTEX(&new_bd->sem);
         new_bd->props = bp;
         memset(&new_bd->class_dev, 0, sizeof(new_bd->class_dev));
diff --git a/drivers/video/backlight/lcd.c b/drivers/video/backlight/lcd.c
index 959024812abc..1e1e61a4b5da 100644
--- a/drivers/video/backlight/lcd.c
+++ b/drivers/video/backlight/lcd.c
@@ -198,6 +198,7 @@ struct lcd_device *lcd_device_register(const char *name, void *devdata,
                 return ERR_PTR(-ENOMEM);
 
         init_MUTEX(&new_ld->sem);
+        mutex_init(&new_ld->update_lock);
         new_ld->props = lp;
         memset(&new_ld->class_dev, 0, sizeof(new_ld->class_dev));
         new_ld->class_dev.class = &lcd_class;
diff --git a/drivers/video/chipsfb.c b/drivers/video/chipsfb.c
index 73cb426bf2d7..9a656bc6295c 100644
--- a/drivers/video/chipsfb.c
+++ b/drivers/video/chipsfb.c
@@ -153,13 +153,11 @@ static int chipsfb_blank(int blank, struct fb_info *info)
                  * useful at blank = 1 too (saves battery, extends backlight
                  * life)
                  */
-                down(&pmac_backlight->sem);
                 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);
+                backlight_update_status(pmac_backlight);
         }
 
         mutex_unlock(&pmac_backlight_mutex);
@@ -415,10 +413,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);
+                backlight_update_status(pmac_backlight);
         }
         mutex_unlock(&pmac_backlight_mutex);
 #endif /* CONFIG_PMAC_BACKLIGHT */
diff --git a/drivers/video/nvidia/nv_backlight.c b/drivers/video/nvidia/nv_backlight.c
index 4254c090dc4b..f5e42d0bd0da 100644
--- a/drivers/video/nvidia/nv_backlight.c
+++ b/drivers/video/nvidia/nv_backlight.c
@@ -114,10 +114,8 @@ void nvidia_bl_set_power(struct fb_info *info, int power)
         mutex_lock(&info->bl_mutex);
 
         if (info->bl_dev) {
-                down(&info->bl_dev->sem);
                 info->bl_dev->props->power = power;
                 __nvidia_bl_update_status(info->bl_dev);
-                up(&info->bl_dev->sem);
         }
 
         mutex_unlock(&info->bl_mutex);
@@ -154,11 +152,9 @@ void nvidia_bl_init(struct nvidia_par *par)
                 0x534 * FB_BACKLIGHT_MAX / MAX_LEVEL);
         mutex_unlock(&info->bl_mutex);
 
-        down(&bd->sem);
         bd->props->brightness = nvidia_bl_data.max_brightness;
         bd->props->power = FB_BLANK_UNBLANK;
-        bd->props->update_status(bd);
-        up(&bd->sem);
+        backlight_update_status(bd);
 
 #ifdef CONFIG_PMAC_BACKLIGHT
         mutex_lock(&pmac_backlight_mutex);
diff --git a/drivers/video/riva/fbdev.c b/drivers/video/riva/fbdev.c
index fd825711bb63..b70d18f7fcd9 100644
--- a/drivers/video/riva/fbdev.c
+++ b/drivers/video/riva/fbdev.c
@@ -357,10 +357,8 @@ static void riva_bl_set_power(struct fb_info *info, int power)
         mutex_lock(&info->bl_mutex);
 
         if (info->bl_dev) {
-                down(&info->bl_dev->sem);
                 info->bl_dev->props->power = power;
                 __riva_bl_update_status(info->bl_dev);
-                up(&info->bl_dev->sem);
         }
 
         mutex_unlock(&info->bl_mutex);
@@ -397,11 +395,9 @@ static void riva_bl_init(struct riva_par *par)
                 FB_BACKLIGHT_MAX);
         mutex_unlock(&info->bl_mutex);
 
-        down(&bd->sem);
         bd->props->brightness = riva_bl_data.max_brightness;
         bd->props->power = FB_BLANK_UNBLANK;
-        bd->props->update_status(bd);
-        up(&bd->sem);
+        backlight_update_status(bd);
 
 #ifdef CONFIG_PMAC_BACKLIGHT
         mutex_lock(&pmac_backlight_mutex);