Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master

1 files changed, 13 insertions, 7 deletions

diff --git a/drivers/video/backlight/pwm_bl.c b/drivers/video/backlight/pwm_bl.c
index 887166267443..550443518891 100644
--- a/drivers/video/backlight/pwm_bl.c
+++ b/drivers/video/backlight/pwm_bl.c
@@ -19,11 +19,14 @@
 #include <linux/err.h>
 #include <linux/pwm.h>
 #include <linux/pwm_backlight.h>
+#include <linux/slab.h>
 
 struct pwm_bl_data {
         struct pwm_device       *pwm;
+        struct device           *dev;
         unsigned int            period;
-        int                     (*notify)(int brightness);
+        int                     (*notify)(struct device *,
+                                          int brightness);
 };
 
 static int pwm_backlight_update_status(struct backlight_device *bl)
@@ -39,7 +42,7 @@ static int pwm_backlight_update_status(struct backlight_device *bl)
                 brightness = 0;
 
         if (pb->notify)
-                brightness = pb->notify(brightness);
+                brightness = pb->notify(pb->dev, brightness);
 
         if (brightness == 0) {
                 pwm_config(pb->pwm, 0, pb->period);
@@ -56,13 +59,14 @@ static int pwm_backlight_get_brightness(struct backlight_device *bl)
         return bl->props.brightness;
 }
 
-static struct backlight_ops pwm_backlight_ops = {
+static const struct backlight_ops pwm_backlight_ops = {
         .update_status  = pwm_backlight_update_status,
         .get_brightness = pwm_backlight_get_brightness,
 };
 
 static int pwm_backlight_probe(struct platform_device *pdev)
 {
+        struct backlight_properties props;
         struct platform_pwm_backlight_data *data = pdev->dev.platform_data;
         struct backlight_device *bl;
         struct pwm_bl_data *pb;
@@ -88,6 +92,7 @@ static int pwm_backlight_probe(struct platform_device *pdev)
 
         pb->period = data->pwm_period_ns;
         pb->notify = data->notify;
+        pb->dev = &pdev->dev;
 
         pb->pwm = pwm_request(data->pwm_id, "backlight");
         if (IS_ERR(pb->pwm)) {
@@ -97,15 +102,16 @@ static int pwm_backlight_probe(struct platform_device *pdev)
         } else
                 dev_dbg(&pdev->dev, "got pwm for backlight\n");
 
-        bl = backlight_device_register(dev_name(&pdev->dev), &pdev->dev,
-                        pb, &pwm_backlight_ops);
+        memset(&props, 0, sizeof(struct backlight_properties));
+        props.max_brightness = data->max_brightness;
+        bl = backlight_device_register(dev_name(&pdev->dev), &pdev->dev, pb,
+                                       &pwm_backlight_ops, &props);
         if (IS_ERR(bl)) {
                 dev_err(&pdev->dev, "failed to register backlight\n");
                 ret = PTR_ERR(bl);
                 goto err_bl;
         }
 
-        bl->props.max_brightness = data->max_brightness;
         bl->props.brightness = data->dft_brightness;
         backlight_update_status(bl);
 
@@ -146,7 +152,7 @@ static int pwm_backlight_suspend(struct platform_device *pdev,
         struct pwm_bl_data *pb = dev_get_drvdata(&bl->dev);
 
         if (pb->notify)
-                pb->notify(0);
+                pb->notify(pb->dev, 0);
         pwm_config(pb->pwm, 0, pb->period);
         pwm_disable(pb->pwm);
         return 0;