2 files changed, 30 insertions, 26 deletions

diff --git a/drivers/video/au1100fb.c b/drivers/video/au1100fb.c
index 62bd4441b5e0..378f27745a1d 100644
--- a/drivers/video/au1100fb.c
+++ b/drivers/video/au1100fb.c
@@ -457,7 +457,7 @@ static struct fb_ops au1100fb_ops =
 
 /* AU1100 LCD controller device driver */
 
-static int __init au1100fb_drv_probe(struct device *dev)
+static int __init au1100fb_drv_probe(struct platform_device *dev)
 {
         struct au1100fb_device *fbdev = NULL;
         struct resource *regs_res;
@@ -475,7 +475,7 @@ static int __init au1100fb_drv_probe(struct device *dev)
 
         fbdev->panel = &known_lcd_panels[drv_info.panel_idx];
 
-        dev_set_drvdata(dev, (void*)fbdev);
+        platform_set_drvdata(dev, (void *)fbdev);
 
         /* Allocate region for our registers and map them */
         if (!(regs_res = platform_get_resource(to_platform_device(dev),
@@ -583,19 +583,19 @@ failed:
                 fb_dealloc_cmap(&fbdev->info.cmap);
         }
         kfree(fbdev);
-        dev_set_drvdata(dev, NULL);
+        platform_set_drvdata(dev, NULL);
 
         return 0;
 }
 
-int au1100fb_drv_remove(struct device *dev)
+int au1100fb_drv_remove(struct platform_device *dev)
 {
         struct au1100fb_device *fbdev = NULL;
 
         if (!dev)
                 return -ENODEV;
 
-        fbdev = (struct au1100fb_device*) dev_get_drvdata(dev);
+        fbdev = (struct au1100fb_device *) platform_get_drvdata(dev);
 
 #if !defined(CONFIG_FRAMEBUFFER_CONSOLE) && defined(CONFIG_LOGO)
         au1100fb_fb_blank(VESA_POWERDOWN, &fbdev->info);
@@ -620,9 +620,9 @@ int au1100fb_drv_remove(struct device *dev)
 static u32 sys_clksrc;
 static struct au1100fb_regs fbregs;
 
-int au1100fb_drv_suspend(struct device *dev, pm_message_t state)
+int au1100fb_drv_suspend(struct platform_device *dev, pm_message_t state)
 {
-        struct au1100fb_device *fbdev = dev_get_drvdata(dev);
+        struct au1100fb_device *fbdev = platform_get_drvdata(dev);
 
         if (!fbdev)
                 return 0;
@@ -641,9 +641,9 @@ int au1100fb_drv_suspend(struct device *dev, pm_message_t state)
         return 0;
 }
 
-int au1100fb_drv_resume(struct device *dev)
+int au1100fb_drv_resume(struct platform_device *dev)
 {
-        struct au1100fb_device *fbdev = dev_get_drvdata(dev);
+        struct au1100fb_device *fbdev = platform_get_drvdata(dev);
 
         if (!fbdev)
                 return 0;
@@ -663,10 +663,11 @@ int au1100fb_drv_resume(struct device *dev)
 #define au1100fb_drv_resume NULL
 #endif
 
-static struct device_driver au1100fb_driver = {
-        .name           = "au1100-lcd",
-        .bus            = &platform_bus_type,
-
+static struct platform_driver au1100fb_driver = {
+        .driver = {
+                .name           = "au1100-lcd",
+                .owner          = THIS_MODULE,
+        },
         .probe          = au1100fb_drv_probe,
         .remove         = au1100fb_drv_remove,
         .suspend        = au1100fb_drv_suspend,
@@ -753,12 +754,12 @@ int __init au1100fb_init(void)
                 return ret;
         }
 
-        return driver_register(&au1100fb_driver);
+        return platform_driver_register(&au1100fb_driver);
 }
 
 void __exit au1100fb_cleanup(void)
 {
-        driver_unregister(&au1100fb_driver);
+        platform_driver_unregister(&au1100fb_driver);
 
         kfree(drv_info.opt_mode);
 }
diff --git a/drivers/video/au1200fb.c b/drivers/video/au1200fb.c
index 03e57ef88378..0d96f1d2d4c5 100644
--- a/drivers/video/au1200fb.c
+++ b/drivers/video/au1200fb.c
@@ -1622,7 +1622,7 @@ static int au1200fb_init_fbinfo(struct au1200fb_device *fbdev)
 
 /* AU1200 LCD controller device driver */
 
-static int au1200fb_drv_probe(struct device *dev)
+static int au1200fb_drv_probe(struct platform_device *dev)
 {
         struct au1200fb_device *fbdev;
         unsigned long page;
@@ -1645,7 +1645,7 @@ static int au1200fb_drv_probe(struct device *dev)
                 /* Allocate the framebuffer to the maximum screen size */
                 fbdev->fb_len = (win->w[plane].xres * win->w[plane].yres * bpp) / 8;
 
-                fbdev->fb_mem = dma_alloc_noncoherent(dev,
+                fbdev->fb_mem = dma_alloc_noncoherent(&dev->dev,
                                 PAGE_ALIGN(fbdev->fb_len),
                                 &fbdev->fb_phys, GFP_KERNEL);
                 if (!fbdev->fb_mem) {
@@ -1715,7 +1715,7 @@ failed:
         return ret;
 }
 
-static int au1200fb_drv_remove(struct device *dev)
+static int au1200fb_drv_remove(struct platform_device *dev)
 {
         struct au1200fb_device *fbdev;
         int plane;
@@ -1733,7 +1733,8 @@ static int au1200fb_drv_remove(struct device *dev)
                 /* Clean up all probe data */
                 unregister_framebuffer(&fbdev->fb_info);
                 if (fbdev->fb_mem)
-                        dma_free_noncoherent(dev, PAGE_ALIGN(fbdev->fb_len),
+                        dma_free_noncoherent(&dev->dev,
+                                        PAGE_ALIGN(fbdev->fb_len),
                                         fbdev->fb_mem, fbdev->fb_phys);
                 if (fbdev->fb_info.cmap.len != 0)
                         fb_dealloc_cmap(&fbdev->fb_info.cmap);
@@ -1747,22 +1748,24 @@ static int au1200fb_drv_remove(struct device *dev)
 }
 
 #ifdef CONFIG_PM
-static int au1200fb_drv_suspend(struct device *dev, u32 state, u32 level)
+static int au1200fb_drv_suspend(struct platform_device *dev, u32 state)
 {
         /* TODO */
         return 0;
 }
 
-static int au1200fb_drv_resume(struct device *dev, u32 level)
+static int au1200fb_drv_resume(struct platform_device *dev)
 {
         /* TODO */
         return 0;
 }
 #endif /* CONFIG_PM */
 
-static struct device_driver au1200fb_driver = {
-        .name           = "au1200-lcd",
-        .bus            = &platform_bus_type,
+static struct platform_driver au1200fb_driver = {
+        .driver = {
+                .name           = "au1200-lcd",
+                .owner          = THIS_MODULE,
+        },
         .probe          = au1200fb_drv_probe,
         .remove         = au1200fb_drv_remove,
 #ifdef CONFIG_PM
@@ -1906,12 +1909,12 @@ static int __init au1200fb_init(void)
                 printk(KERN_INFO "Power management device entry for the au1200fb loaded.\n");
         #endif
 
-        return driver_register(&au1200fb_driver);
+        return platform_driver_register(&au1200fb_driver);
 }
 
 static void __exit au1200fb_cleanup(void)
 {
-        driver_unregister(&au1200fb_driver);
+        platform_driver_unregister(&au1200fb_driver);
 }
 
 module_init(au1200fb_init);