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

1 files changed, 78 insertions, 59 deletions

diff --git a/drivers/video/backlight/adp5520_bl.c b/drivers/video/backlight/adp5520_bl.c
index ad05da5ba3c7..9f436e014f85 100644
--- a/drivers/video/backlight/adp5520_bl.c
+++ b/drivers/video/backlight/adp5520_bl.c
@@ -12,10 +12,11 @@
 #include <linux/fb.h>
 #include <linux/backlight.h>
 #include <linux/mfd/adp5520.h>
+#include <linux/slab.h>
 
 struct adp5520_bl {
         struct device *master;
-        struct adp5520_backlight_platfrom_data *pdata;
+        struct adp5520_backlight_platform_data *pdata;
         struct mutex lock;
         unsigned long cached_daylight_max;
         int id;
@@ -31,29 +32,30 @@ static int adp5520_bl_set(struct backlight_device *bl, int brightness)
         if (data->pdata->en_ambl_sens) {
                 if ((brightness > 0) && (brightness < ADP5020_MAX_BRIGHTNESS)) {
                         /* Disable Ambient Light auto adjust */
-                        ret |= adp5520_clr_bits(master, BL_CONTROL,
-                                        BL_AUTO_ADJ);
-                        ret |= adp5520_write(master, DAYLIGHT_MAX, brightness);
+                        ret |= adp5520_clr_bits(master, ADP5520_BL_CONTROL,
+                                        ADP5520_BL_AUTO_ADJ);
+                        ret |= adp5520_write(master, ADP5520_DAYLIGHT_MAX,
+                                        brightness);
                 } else {
                         /*
                          * MAX_BRIGHTNESS -> Enable Ambient Light auto adjust
                          * restore daylight l3 sysfs brightness
                          */
-                        ret |= adp5520_write(master, DAYLIGHT_MAX,
+                        ret |= adp5520_write(master, ADP5520_DAYLIGHT_MAX,
                                          data->cached_daylight_max);
-                        ret |= adp5520_set_bits(master, BL_CONTROL,
-                                         BL_AUTO_ADJ);
+                        ret |= adp5520_set_bits(master, ADP5520_BL_CONTROL,
+                                         ADP5520_BL_AUTO_ADJ);
                 }
         } else {
-                ret |= adp5520_write(master, DAYLIGHT_MAX, brightness);
+                ret |= adp5520_write(master, ADP5520_DAYLIGHT_MAX, brightness);
         }
 
         if (data->current_brightness && brightness == 0)
                 ret |= adp5520_set_bits(master,
-                                MODE_STATUS, DIM_EN);
+                                ADP5520_MODE_STATUS, ADP5520_DIM_EN);
         else if (data->current_brightness == 0 && brightness)
                 ret |= adp5520_clr_bits(master,
-                                MODE_STATUS, DIM_EN);
+                                ADP5520_MODE_STATUS, ADP5520_DIM_EN);
 
         if (!ret)
                 data->current_brightness = brightness;
@@ -79,12 +81,12 @@ static int adp5520_bl_get_brightness(struct backlight_device *bl)
         int error;
         uint8_t reg_val;
 
-        error = adp5520_read(data->master, BL_VALUE, &reg_val);
+        error = adp5520_read(data->master, ADP5520_BL_VALUE, &reg_val);
 
         return error ? data->current_brightness : reg_val;
 }
 
-static struct backlight_ops adp5520_bl_ops = {
+static const struct backlight_ops adp5520_bl_ops = {
         .update_status  = adp5520_bl_update_status,
         .get_brightness = adp5520_bl_get_brightness,
 };
@@ -93,33 +95,46 @@ static int adp5520_bl_setup(struct backlight_device *bl)
 {
         struct adp5520_bl *data = bl_get_data(bl);
         struct device *master = data->master;
-        struct adp5520_backlight_platfrom_data *pdata = data->pdata;
+        struct adp5520_backlight_platform_data *pdata = data->pdata;
         int ret = 0;
 
-        ret |= adp5520_write(master, DAYLIGHT_MAX, pdata->l1_daylight_max);
-        ret |= adp5520_write(master, DAYLIGHT_DIM, pdata->l1_daylight_dim);
+        ret |= adp5520_write(master, ADP5520_DAYLIGHT_MAX,
+                                pdata->l1_daylight_max);
+        ret |= adp5520_write(master, ADP5520_DAYLIGHT_DIM,
+                                pdata->l1_daylight_dim);
 
         if (pdata->en_ambl_sens) {
                 data->cached_daylight_max = pdata->l1_daylight_max;
-                ret |= adp5520_write(master, OFFICE_MAX, pdata->l2_office_max);
-                ret |= adp5520_write(master, OFFICE_DIM, pdata->l2_office_dim);
-                ret |= adp5520_write(master, DARK_MAX, pdata->l3_dark_max);
-                ret |= adp5520_write(master, DARK_DIM, pdata->l3_dark_dim);
-                ret |= adp5520_write(master, L2_TRIP, pdata->l2_trip);
-                ret |= adp5520_write(master, L2_HYS, pdata->l2_hyst);
-                ret |= adp5520_write(master, L3_TRIP, pdata->l3_trip);
-                ret |= adp5520_write(master, L3_HYS, pdata->l3_hyst);
-                ret |= adp5520_write(master, ALS_CMPR_CFG,
-                        ALS_CMPR_CFG_VAL(pdata->abml_filt, L3_EN));
+                ret |= adp5520_write(master, ADP5520_OFFICE_MAX,
+                                pdata->l2_office_max);
+                ret |= adp5520_write(master, ADP5520_OFFICE_DIM,
+                                pdata->l2_office_dim);
+                ret |= adp5520_write(master, ADP5520_DARK_MAX,
+                                pdata->l3_dark_max);
+                ret |= adp5520_write(master, ADP5520_DARK_DIM,
+                                pdata->l3_dark_dim);
+                ret |= adp5520_write(master, ADP5520_L2_TRIP,
+                                pdata->l2_trip);
+                ret |= adp5520_write(master, ADP5520_L2_HYS,
+                                pdata->l2_hyst);
+                ret |= adp5520_write(master, ADP5520_L3_TRIP,
+                                 pdata->l3_trip);
+                ret |= adp5520_write(master, ADP5520_L3_HYS,
+                                pdata->l3_hyst);
+                ret |= adp5520_write(master, ADP5520_ALS_CMPR_CFG,
+                                ALS_CMPR_CFG_VAL(pdata->abml_filt,
+                                ADP5520_L3_EN));
         }
 
-        ret |= adp5520_write(master, BL_CONTROL,
-                        BL_CTRL_VAL(pdata->fade_led_law, pdata->en_ambl_sens));
+        ret |= adp5520_write(master, ADP5520_BL_CONTROL,
+                        BL_CTRL_VAL(pdata->fade_led_law,
+                                        pdata->en_ambl_sens));
 
-        ret |= adp5520_write(master, BL_FADE, FADE_VAL(pdata->fade_in,
+        ret |= adp5520_write(master, ADP5520_BL_FADE, FADE_VAL(pdata->fade_in,
                         pdata->fade_out));
 
-        ret |= adp5520_set_bits(master, MODE_STATUS, BL_EN | DIM_EN);
+        ret |= adp5520_set_bits(master, ADP5520_MODE_STATUS,
+                        ADP5520_BL_EN | ADP5520_DIM_EN);
 
         return ret;
 }
@@ -156,29 +171,31 @@ static ssize_t adp5520_store(struct device *dev, const char *buf,
 }
 
 static ssize_t adp5520_bl_dark_max_show(struct device *dev,
-                struct device_attribute *attr, char *buf)
+                        struct device_attribute *attr, char *buf)
 {
-        return adp5520_show(dev, buf, DARK_MAX);
+        return adp5520_show(dev, buf, ADP5520_DARK_MAX);
 }
 
 static ssize_t adp5520_bl_dark_max_store(struct device *dev,
-                struct device_attribute *attr, const char *buf, size_t count)
+                        struct device_attribute *attr,
+                        const char *buf, size_t count)
 {
-        return adp5520_store(dev, buf, count, DARK_MAX);
+        return adp5520_store(dev, buf, count, ADP5520_DARK_MAX);
 }
 static DEVICE_ATTR(dark_max, 0664, adp5520_bl_dark_max_show,
                         adp5520_bl_dark_max_store);
 
 static ssize_t adp5520_bl_office_max_show(struct device *dev,
-                                     struct device_attribute *attr, char *buf)
+                        struct device_attribute *attr, char *buf)
 {
-        return adp5520_show(dev, buf, OFFICE_MAX);
+        return adp5520_show(dev, buf, ADP5520_OFFICE_MAX);
 }
 
 static ssize_t adp5520_bl_office_max_store(struct device *dev,
-                struct device_attribute *attr, const char *buf, size_t count)
+                        struct device_attribute *attr,
+                        const char *buf, size_t count)
 {
-        return adp5520_store(dev, buf, count, OFFICE_MAX);
+        return adp5520_store(dev, buf, count, ADP5520_OFFICE_MAX);
 }
 static DEVICE_ATTR(office_max, 0664, adp5520_bl_office_max_show,
                         adp5520_bl_office_max_store);
@@ -186,16 +203,17 @@ static DEVICE_ATTR(office_max, 0664, adp5520_bl_office_max_show,
 static ssize_t adp5520_bl_daylight_max_show(struct device *dev,
                         struct device_attribute *attr, char *buf)
 {
-        return adp5520_show(dev, buf, DAYLIGHT_MAX);
+        return adp5520_show(dev, buf, ADP5520_DAYLIGHT_MAX);
 }
 
 static ssize_t adp5520_bl_daylight_max_store(struct device *dev,
-                struct device_attribute *attr, const char *buf, size_t count)
+                        struct device_attribute *attr,
+                        const char *buf, size_t count)
 {
         struct adp5520_bl *data = dev_get_drvdata(dev);
 
         strict_strtoul(buf, 10, &data->cached_daylight_max);
-        return adp5520_store(dev, buf, count, DAYLIGHT_MAX);
+        return adp5520_store(dev, buf, count, ADP5520_DAYLIGHT_MAX);
 }
 static DEVICE_ATTR(daylight_max, 0664, adp5520_bl_daylight_max_show,
                         adp5520_bl_daylight_max_store);
@@ -203,14 +221,14 @@ static DEVICE_ATTR(daylight_max, 0664, adp5520_bl_daylight_max_show,
 static ssize_t adp5520_bl_dark_dim_show(struct device *dev,
                         struct device_attribute *attr, char *buf)
 {
-        return adp5520_show(dev, buf, DARK_DIM);
+        return adp5520_show(dev, buf, ADP5520_DARK_DIM);
 }
 
 static ssize_t adp5520_bl_dark_dim_store(struct device *dev,
-                                     struct device_attribute *attr,
-                                     const char *buf, size_t count)
+                        struct device_attribute *attr,
+                        const char *buf, size_t count)
 {
-        return adp5520_store(dev, buf, count, DARK_DIM);
+        return adp5520_store(dev, buf, count, ADP5520_DARK_DIM);
 }
 static DEVICE_ATTR(dark_dim, 0664, adp5520_bl_dark_dim_show,
                         adp5520_bl_dark_dim_store);
@@ -218,29 +236,29 @@ static DEVICE_ATTR(dark_dim, 0664, adp5520_bl_dark_dim_show,
 static ssize_t adp5520_bl_office_dim_show(struct device *dev,
                         struct device_attribute *attr, char *buf)
 {
-        return adp5520_show(dev, buf, OFFICE_DIM);
+        return adp5520_show(dev, buf, ADP5520_OFFICE_DIM);
 }
 
 static ssize_t adp5520_bl_office_dim_store(struct device *dev,
-                                     struct device_attribute *attr,
-                                     const char *buf, size_t count)
+                        struct device_attribute *attr,
+                        const char *buf, size_t count)
 {
-        return adp5520_store(dev, buf, count, OFFICE_DIM);
+        return adp5520_store(dev, buf, count, ADP5520_OFFICE_DIM);
 }
 static DEVICE_ATTR(office_dim, 0664, adp5520_bl_office_dim_show,
                         adp5520_bl_office_dim_store);
 
 static ssize_t adp5520_bl_daylight_dim_show(struct device *dev,
-                                     struct device_attribute *attr, char *buf)
+                        struct device_attribute *attr, char *buf)
 {
-        return adp5520_show(dev, buf, DAYLIGHT_DIM);
+        return adp5520_show(dev, buf, ADP5520_DAYLIGHT_DIM);
 }
 
 static ssize_t adp5520_bl_daylight_dim_store(struct device *dev,
-                                     struct device_attribute *attr,
-                                     const char *buf, size_t count)
+                        struct device_attribute *attr,
+                        const char *buf, size_t count)
 {
-        return adp5520_store(dev, buf, count, DAYLIGHT_DIM);
+        return adp5520_store(dev, buf, count, ADP5520_DAYLIGHT_DIM);
 }
 static DEVICE_ATTR(daylight_dim, 0664, adp5520_bl_daylight_dim_show,
                         adp5520_bl_daylight_dim_store);
@@ -261,6 +279,7 @@ static const struct attribute_group adp5520_bl_attr_group = {
 
 static int __devinit adp5520_bl_probe(struct platform_device *pdev)
 {
+        struct backlight_properties props;
         struct backlight_device *bl;
         struct adp5520_bl *data;
         int ret = 0;
@@ -283,17 +302,17 @@ static int __devinit adp5520_bl_probe(struct platform_device *pdev)
 
         mutex_init(&data->lock);
 
-        bl = backlight_device_register(pdev->name, data->master,
-                        data, &adp5520_bl_ops);
+        memset(&props, 0, sizeof(struct backlight_properties));
+        props.max_brightness = ADP5020_MAX_BRIGHTNESS;
+        bl = backlight_device_register(pdev->name, data->master, data,
+                                       &adp5520_bl_ops, &props);
         if (IS_ERR(bl)) {
                 dev_err(&pdev->dev, "failed to register backlight\n");
                 kfree(data);
                 return PTR_ERR(bl);
         }
 
-        bl->props.max_brightness =
-                bl->props.brightness = ADP5020_MAX_BRIGHTNESS;
-
+        bl->props.brightness = ADP5020_MAX_BRIGHTNESS;
         if (data->pdata->en_ambl_sens)
                 ret = sysfs_create_group(&bl->dev.kobj,
                         &adp5520_bl_attr_group);
@@ -316,7 +335,7 @@ static int __devexit adp5520_bl_remove(struct platform_device *pdev)
         struct backlight_device *bl = platform_get_drvdata(pdev);
         struct adp5520_bl *data = bl_get_data(bl);
 
-        adp5520_clr_bits(data->master, MODE_STATUS, BL_EN);
+        adp5520_clr_bits(data->master, ADP5520_MODE_STATUS, ADP5520_BL_EN);
 
         if (data->pdata->en_ambl_sens)
                 sysfs_remove_group(&bl->dev.kobj,