backlight: Separate backlight properties from backlight ops pointers

[firefly-linux-kernel-4.4.55.git] / drivers / video / backlight / corgi_bl.c

diff --git a/drivers/video/backlight/corgi_bl.c b/drivers/video/backlight/corgi_bl.c
index 2ebbfd95145fd34587cbd715b2d59048c283abfb..05f36811ac952155f9c5b64e21e2abd9a791dc5c 100644 (file)
--- a/drivers/video/backlight/corgi_bl.c
+++ b/drivers/video/backlight/corgi_bl.c
@@ -34,11 +34,11 @@ 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;
@@ -61,17 +61,21 @@ static int corgibl_send_intensity(struct backlight_device *bd)
 }
 
 #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);
+       corgibl_send_intensity(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);
+       corgibl_send_intensity(bd);
        return 0;
 }
 #else
@@ -84,12 +88,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
@@ -105,37 +103,44 @@ void corgibl_limit_intensity(int limit)
 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 __init corgibl_probe(struct platform_device *pdev)
+static int corgibl_probe(struct platform_device *pdev)
 {
        struct corgibl_machinfo *machinfo = pdev->dev.platform_data;
 
        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);
+               &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;
+       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;
        corgibl_send_intensity(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)
 {
-       backlight_device_unregister(corgi_backlight_device);
+       struct backlight_device *bd = platform_get_drvdata(pdev);
+
+       corgibl_data.power = 0;
+       corgibl_data.brightness = 0;
+       corgibl_send_intensity(bd);
+
+       backlight_device_unregister(bd);
 
        printk("Corgi Backlight Driver Unloaded\n");
        return 0;
@@ -166,4 +171,4 @@ module_exit(corgibl_exit);
 
 MODULE_AUTHOR("Richard Purdie <rpurdie@rpsys.net>");
 MODULE_DESCRIPTION("Corgi Backlight Driver");
-MODULE_LICENSE("GPLv2");
+MODULE_LICENSE("GPL");