[DRIVER MODEL] Convert platform drivers to use struct platform_driver

This allows us to eliminate the casts in the drivers, and eventually
remove the use of the device_driver function pointer methods for
platform device drivers.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Acked-by: Greg Kroah-Hartman <gregkh@suse.de>

1 files changed, 13 insertions, 12 deletions

diff --git a/drivers/video/sa1100fb.c b/drivers/video/sa1100fb.c
index a5184575cfae..2ea1354e439f 100644
--- a/drivers/video/sa1100fb.c
+++ b/drivers/video/sa1100fb.c
@@ -1308,17 +1308,17 @@ sa1100fb_freq_policy(struct notifier_block *nb, unsigned long val,
  * Power management hooks.  Note that we won't be called from IRQ context,
  * unlike the blank functions above, so we may sleep.
  */
-static int sa1100fb_suspend(struct device *dev, pm_message_t state)
+static int sa1100fb_suspend(struct platform_device *dev, pm_message_t state)
 {
-        struct sa1100fb_info *fbi = dev_get_drvdata(dev);
+        struct sa1100fb_info *fbi = platform_get_drvdata(dev);
 
         set_ctrlr_state(fbi, C_DISABLE_PM);
         return 0;
 }
 
-static int sa1100fb_resume(struct device *dev)
+static int sa1100fb_resume(struct platform_device *dev)
 {
-        struct sa1100fb_info *fbi = dev_get_drvdata(dev);
+        struct sa1100fb_info *fbi = platform_get_drvdata(dev);
 
         set_ctrlr_state(fbi, C_ENABLE_PM);
         return 0;
@@ -1452,7 +1452,7 @@ static struct sa1100fb_info * __init sa1100fb_init_fbinfo(struct device *dev)
         return fbi;
 }
 
-static int __init sa1100fb_probe(struct device *dev)
+static int __init sa1100fb_probe(struct platform_device *pdev)
 {
         struct sa1100fb_info *fbi;
         int ret;
@@ -1460,7 +1460,7 @@ static int __init sa1100fb_probe(struct device *dev)
         if (!request_mem_region(0xb0100000, 0x10000, "LCD"))
                 return -EBUSY;
 
-        fbi = sa1100fb_init_fbinfo(dev);
+        fbi = sa1100fb_init_fbinfo(&pdev->dev);
         ret = -ENOMEM;
         if (!fbi)
                 goto failed;
@@ -1488,7 +1488,7 @@ static int __init sa1100fb_probe(struct device *dev)
          */
         sa1100fb_check_var(&fbi->fb.var, &fbi->fb);
 
-        dev_set_drvdata(dev, fbi);
+        platform_set_drvdata(pdev, fbi);
 
         ret = register_framebuffer(&fbi->fb);
         if (ret < 0)
@@ -1505,18 +1505,19 @@ static int __init sa1100fb_probe(struct device *dev)
         return 0;
 
 failed:
-        dev_set_drvdata(dev, NULL);
+        platform_set_drvdata(pdev, NULL);
         kfree(fbi);
         release_mem_region(0xb0100000, 0x10000);
         return ret;
 }
 
-static struct device_driver sa1100fb_driver = {
-        .name           = "sa11x0-fb",
-        .bus            = &platform_bus_type,
+static struct platform_driver sa1100fb_driver = {
         .probe          = sa1100fb_probe,
         .suspend        = sa1100fb_suspend,
         .resume         = sa1100fb_resume,
+        .driver         = {
+                .name   = "sa11x0-fb",
+        },
 };
 
 int __init sa1100fb_init(void)
@@ -1524,7 +1525,7 @@ int __init sa1100fb_init(void)
         if (fb_get_options("sa1100fb", NULL))
                 return -ENODEV;
 
-        return driver_register(&sa1100fb_driver);
+        return platform_driver_register(&sa1100fb_driver);
 }
 
 int __init sa1100fb_setup(char *options)