Merge branch 'for-jeff' of git://git.kernel.org/pub/scm/linux/kernel/git/chris/linux...

[linux-2.6-omap-h63xx.git] / drivers / video / backlight / corgi_bl.c

diff --git a/drivers/video/backlight/corgi_bl.c b/drivers/video/backlight/corgi_bl.c
index 61587ca2cdbb5f708f3d0f37babec91fa3153163..4d4d037e3ec9667190073a6feaeae72ee25d848c 100644 (file)
--- a/drivers/video/backlight/corgi_bl.c
+++ b/drivers/video/backlight/corgi_bl.c
@@ -18,14 +18,11 @@
 #include <linux/mutex.h>
 #include <linux/fb.h>
 #include <linux/backlight.h>
-#include <asm/arch/sharpsl.h>
-#include <asm/hardware/sharpsl_pm.h>
 
 static int corgibl_intensity;
-static DEFINE_MUTEX(bl_mutex);
 static struct backlight_properties corgibl_data;
 static struct backlight_device *corgi_backlight_device;
-static struct corgibl_machinfo *bl_machinfo;
+static struct generic_bl_info *bl_machinfo;
 
 static unsigned long corgibl_flags;
 #define CORGIBL_SUSPENDED     0x01
@@ -33,45 +30,43 @@ static unsigned long corgibl_flags;
 
 static int corgibl_send_intensity(struct backlight_device *bd)
 {
-       void (*corgi_kick_batt)(void);
-       int intensity = bd->props->brightness;
+       int intensity = bd->props.brightness;
 
-       if (bd->props->power != FB_BLANK_UNBLANK)
+       if (bd->props.power != FB_BLANK_UNBLANK)
                intensity = 0;
-       if (bd->props->fb_blank != FB_BLANK_UNBLANK)
+       if (bd->props.fb_blank != FB_BLANK_UNBLANK)
                intensity = 0;
        if (corgibl_flags & CORGIBL_SUSPENDED)
                intensity = 0;
        if (corgibl_flags & CORGIBL_BATTLOW)
                intensity &= bl_machinfo->limit_mask;
 
-       mutex_lock(&bl_mutex);
        bl_machinfo->set_bl_intensity(intensity);
-       mutex_unlock(&bl_mutex);
 
        corgibl_intensity = intensity;
 
-       corgi_kick_batt = symbol_get(sharpsl_battery_kick);
-       if (corgi_kick_batt) {
-               corgi_kick_batt();
-               symbol_put(sharpsl_battery_kick);
-       }
+       if (bl_machinfo->kick_battery)
+               bl_machinfo->kick_battery();
 
        return 0;
 }
 
 #ifdef CONFIG_PM
-static int corgibl_suspend(struct platform_device *dev, pm_message_t state)
+static int corgibl_suspend(struct platform_device *pdev, pm_message_t state)
 {
+       struct backlight_device *bd = platform_get_drvdata(pdev);
+
        corgibl_flags |= CORGIBL_SUSPENDED;
-       corgibl_send_intensity(corgi_backlight_device);
+       backlight_update_status(bd);
        return 0;
 }
 
-static int corgibl_resume(struct platform_device *dev)
+static int corgibl_resume(struct platform_device *pdev)
 {
+       struct backlight_device *bd = platform_get_drvdata(pdev);
+
        corgibl_flags &= ~CORGIBL_SUSPENDED;
-       corgibl_send_intensity(corgi_backlight_device);
+       backlight_update_status(bd);
        return 0;
 }
 #else
@@ -84,12 +79,6 @@ static int corgibl_get_intensity(struct backlight_device *bd)
        return corgibl_intensity;
 }
 
-static int corgibl_set_intensity(struct backlight_device *bd)
-{
-       corgibl_send_intensity(corgi_backlight_device);
-       return 0;
-}
-
 /*
  * Called when the battery is low to limit the backlight intensity.
  * If limit==0 clear any limit, otherwise limit the intensity
@@ -100,46 +89,53 @@ void corgibl_limit_intensity(int limit)
                corgibl_flags |= CORGIBL_BATTLOW;
        else
                corgibl_flags &= ~CORGIBL_BATTLOW;
-       corgibl_send_intensity(corgi_backlight_device);
+       backlight_update_status(corgi_backlight_device);
 }
 EXPORT_SYMBOL(corgibl_limit_intensity);
 
 
-static struct backlight_properties corgibl_data = {
-       .owner          = THIS_MODULE,
+static struct backlight_ops corgibl_ops = {
        .get_brightness = corgibl_get_intensity,
-       .update_status  = corgibl_set_intensity,
+       .update_status  = corgibl_send_intensity,
 };
 
 static int corgibl_probe(struct platform_device *pdev)
 {
-       struct corgibl_machinfo *machinfo = pdev->dev.platform_data;
+       struct generic_bl_info *machinfo = pdev->dev.platform_data;
+       const char *name = "generic-bl";
 
        bl_machinfo = machinfo;
-       corgibl_data.max_brightness = machinfo->max_intensity;
        if (!machinfo->limit_mask)
                machinfo->limit_mask = -1;
 
-       corgi_backlight_device = backlight_device_register ("corgi-bl",
-               NULL, &corgibl_data);
+       if (machinfo->name)
+               name = machinfo->name;
+
+       corgi_backlight_device = backlight_device_register (name,
+               &pdev->dev, NULL, &corgibl_ops);
        if (IS_ERR (corgi_backlight_device))
                return PTR_ERR (corgi_backlight_device);
 
-       corgibl_data.power = FB_BLANK_UNBLANK;
-       corgibl_data.brightness = machinfo->default_intensity;
-       corgibl_send_intensity(corgi_backlight_device);
+       platform_set_drvdata(pdev, corgi_backlight_device);
+
+       corgi_backlight_device->props.max_brightness = machinfo->max_intensity;
+       corgi_backlight_device->props.power = FB_BLANK_UNBLANK;
+       corgi_backlight_device->props.brightness = machinfo->default_intensity;
+       backlight_update_status(corgi_backlight_device);
 
        printk("Corgi Backlight Driver Initialized.\n");
        return 0;
 }
 
-static int corgibl_remove(struct platform_device *dev)
+static int corgibl_remove(struct platform_device *pdev)
 {
+       struct backlight_device *bd = platform_get_drvdata(pdev);
+
        corgibl_data.power = 0;
        corgibl_data.brightness = 0;
-       corgibl_send_intensity(corgi_backlight_device);
+       backlight_update_status(bd);
 
-       backlight_device_unregister(corgi_backlight_device);
+       backlight_device_unregister(bd);
 
        printk("Corgi Backlight Driver Unloaded\n");
        return 0;
@@ -151,7 +147,7 @@ static struct platform_driver corgibl_driver = {
        .suspend        = corgibl_suspend,
        .resume         = corgibl_resume,
        .driver         = {
-               .name   = "corgi-bl",
+               .name   = "generic-bl",
        },
 };