2 files changed, 31 insertions, 21 deletions

diff --git a/drivers/video/backlight/da903x_bl.c b/drivers/video/backlight/da903x_bl.c
index 93bb4340cc64..701a1081e199 100644
--- a/drivers/video/backlight/da903x_bl.c
+++ b/drivers/video/backlight/da903x_bl.c
@@ -154,34 +154,38 @@ static int da903x_backlight_remove(struct platform_device *pdev)
 }
 
 #ifdef CONFIG_PM
-static int da903x_backlight_suspend(struct platform_device *pdev,
-                                 pm_message_t state)
+static int da903x_backlight_suspend(struct device *dev)
 {
+        struct platform_device *pdev = to_platform_device(dev);
         struct backlight_device *bl = platform_get_drvdata(pdev);
         return da903x_backlight_set(bl, 0);
 }
 
-static int da903x_backlight_resume(struct platform_device *pdev)
+static int da903x_backlight_resume(struct device *dev)
 {
+        struct platform_device *pdev = to_platform_device(dev);
         struct backlight_device *bl = platform_get_drvdata(pdev);
 
         backlight_update_status(bl);
         return 0;
 }
-#else
-#define da903x_backlight_suspend        NULL
-#define da903x_backlight_resume         NULL
+
+static struct dev_pm_ops da903x_backlight_pm_ops = {
+        .suspend        = da903x_backlight_suspend,
+        .resume         = da903x_backlight_resume,
+};
 #endif
 
 static struct platform_driver da903x_backlight_driver = {
         .driver         = {
                 .name   = "da903x-backlight",
                 .owner  = THIS_MODULE,
+#ifdef CONFIG_PM
+                .pm     = &da903x_backlight_pm_ops,
+#endif
         },
         .probe          = da903x_backlight_probe,
         .remove         = da903x_backlight_remove,
-        .suspend        = da903x_backlight_suspend,
-        .resume         = da903x_backlight_resume,
 };
 
 static int __init da903x_backlight_init(void)
diff --git a/drivers/video/pxafb.c b/drivers/video/pxafb.c
index 6506117c134b..1820c4a24434 100644
--- a/drivers/video/pxafb.c
+++ b/drivers/video/pxafb.c
@@ -1638,24 +1638,26 @@ pxafb_freq_policy(struct notifier_block *nb, unsigned long val, void *data)
  * Power management hooks.  Note that we won't be called from IRQ context,
  * unlike the blank functions above, so we may sleep.
  */
-static int pxafb_suspend(struct platform_device *dev, pm_message_t state)
+static int pxafb_suspend(struct device *dev)
 {
-        struct pxafb_info *fbi = platform_get_drvdata(dev);
+        struct pxafb_info *fbi = dev_get_drvdata(dev);
 
         set_ctrlr_state(fbi, C_DISABLE_PM);
         return 0;
 }
 
-static int pxafb_resume(struct platform_device *dev)
+static int pxafb_resume(struct device *dev)
 {
-        struct pxafb_info *fbi = platform_get_drvdata(dev);
+        struct pxafb_info *fbi = dev_get_drvdata(dev);
 
         set_ctrlr_state(fbi, C_ENABLE_PM);
         return 0;
 }
-#else
-#define pxafb_suspend   NULL
-#define pxafb_resume    NULL
+
+static struct dev_pm_ops pxafb_pm_ops = {
+        .suspend        = pxafb_suspend,
+        .resume         = pxafb_resume,
+};
 #endif
 
 static int __devinit pxafb_init_video_memory(struct pxafb_info *fbi)
@@ -2081,6 +2083,9 @@ static int __devinit pxafb_probe(struct platform_device *dev)
                 goto failed;
         }
 
+        if (cpu_is_pxa3xx() && inf->acceleration_enabled)
+                fbi->fb.fix.accel = FB_ACCEL_PXA3XX;
+
         fbi->backlight_power = inf->pxafb_backlight_power;
         fbi->lcd_power = inf->pxafb_lcd_power;
 
@@ -2091,14 +2096,14 @@ static int __devinit pxafb_probe(struct platform_device *dev)
                 goto failed_fbi;
         }
 
-        r = request_mem_region(r->start, r->end - r->start + 1, dev->name);
+        r = request_mem_region(r->start, resource_size(r), dev->name);
         if (r == NULL) {
                 dev_err(&dev->dev, "failed to request I/O memory\n");
                 ret = -EBUSY;
                 goto failed_fbi;
         }
 
-        fbi->mmio_base = ioremap(r->start, r->end - r->start + 1);
+        fbi->mmio_base = ioremap(r->start, resource_size(r));
         if (fbi->mmio_base == NULL) {
                 dev_err(&dev->dev, "failed to map I/O memory\n");
                 ret = -EBUSY;
@@ -2197,7 +2202,7 @@ failed_free_dma:
 failed_free_io:
         iounmap(fbi->mmio_base);
 failed_free_res:
-        release_mem_region(r->start, r->end - r->start + 1);
+        release_mem_region(r->start, resource_size(r));
 failed_fbi:
         clk_put(fbi->clk);
         platform_set_drvdata(dev, NULL);
@@ -2237,7 +2242,7 @@ static int __devexit pxafb_remove(struct platform_device *dev)
         iounmap(fbi->mmio_base);
 
         r = platform_get_resource(dev, IORESOURCE_MEM, 0);
-        release_mem_region(r->start, r->end - r->start + 1);
+        release_mem_region(r->start, resource_size(r));
 
         clk_put(fbi->clk);
         kfree(fbi);
@@ -2248,11 +2253,12 @@ static int __devexit pxafb_remove(struct platform_device *dev)
 static struct platform_driver pxafb_driver = {
         .probe          = pxafb_probe,
         .remove         = __devexit_p(pxafb_remove),
-        .suspend        = pxafb_suspend,
-        .resume         = pxafb_resume,
         .driver         = {
                 .owner  = THIS_MODULE,
                 .name   = "pxa2xx-fb",
+#ifdef CONFIG_PM
+                .pm     = &pxafb_pm_ops,
+#endif
         },
 };