[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>

7 files changed, 112 insertions, 121 deletions

diff --git a/drivers/mtd/maps/bast-flash.c b/drivers/mtd/maps/bast-flash.c
index b7858eb93534..51f962dd7e31 100644
--- a/drivers/mtd/maps/bast-flash.c
+++ b/drivers/mtd/maps/bast-flash.c
@@ -63,11 +63,6 @@ struct bast_flash_info {
 
 static const char *probes[] = { "RedBoot", "cmdlinepart", NULL };
 
-static struct bast_flash_info *to_bast_info(struct device *dev)
-{
-        return (struct bast_flash_info *)dev_get_drvdata(dev);
-}
-
 static void bast_flash_setrw(int to)
 {
         unsigned int val;
@@ -87,11 +82,11 @@ static void bast_flash_setrw(int to)
         local_irq_restore(flags);
 }
 
-static int bast_flash_remove(struct device *dev)
+static int bast_flash_remove(struct platform_device *pdev)
 {
-        struct bast_flash_info *info = to_bast_info(dev);
+        struct bast_flash_info *info = platform_get_drvdata(pdev);
 
-        dev_set_drvdata(dev, NULL);
+        platform_set_drvdata(pdev, NULL);
 
         if (info == NULL)
                 return 0;
@@ -116,9 +111,8 @@ static int bast_flash_remove(struct device *dev)
         return 0;
 }
 
-static int bast_flash_probe(struct device *dev)
+static int bast_flash_probe(struct platform_device *pdev)
 {
-        struct platform_device *pdev = to_platform_device(dev);
         struct bast_flash_info *info;
         struct resource *res;
         int err = 0;
@@ -131,13 +125,13 @@ static int bast_flash_probe(struct device *dev)
         }
 
         memzero(info, sizeof(*info));
-        dev_set_drvdata(dev, info);
+        platform_set_drvdata(pdev, info);
 
         res = pdev->resource;  /* assume that the flash has one resource */
 
         info->map.phys = res->start;
         info->map.size = res->end - res->start + 1;
-        info->map.name = dev->bus_id;
+        info->map.name = pdev->dev.bus_id;      
         info->map.bankwidth = 2;
 
         if (info->map.size > AREA_MAXSIZE)
@@ -199,27 +193,28 @@ static int bast_flash_probe(struct device *dev)
         /* fall through to exit error */
 
  exit_error:
-        bast_flash_remove(dev);
+        bast_flash_remove(pdev);
         return err;
 }
 
-static struct device_driver bast_flash_driver = {
-        .name           = "bast-nor",
-        .owner          = THIS_MODULE,
-        .bus            = &platform_bus_type,
+static struct platform_driver bast_flash_driver = {
         .probe          = bast_flash_probe,
         .remove         = bast_flash_remove,
+        .driver         = {
+                .name   = "bast-nor",
+                .owner  = THIS_MODULE,
+        },
 };
 
 static int __init bast_flash_init(void)
 {
         printk("BAST NOR-Flash Driver, (c) 2004 Simtec Electronics\n");
-        return driver_register(&bast_flash_driver);
+        return platform_driver_register(&bast_flash_driver);
 }
 
 static void __exit bast_flash_exit(void)
 {
-        driver_unregister(&bast_flash_driver);
+        platform_driver_unregister(&bast_flash_driver);
 }
 
 module_init(bast_flash_init);
diff --git a/drivers/mtd/maps/integrator-flash.c b/drivers/mtd/maps/integrator-flash.c
index fe738fd8d6f8..a3ba52fbd868 100644
--- a/drivers/mtd/maps/integrator-flash.c
+++ b/drivers/mtd/maps/integrator-flash.c
@@ -67,9 +67,8 @@ static void armflash_set_vpp(struct map_info *map, int on)
 
 static const char *probes[] = { "cmdlinepart", "RedBoot", "afs", NULL };
 
-static int armflash_probe(struct device *_dev)
+static int armflash_probe(struct platform_device *dev)
 {
-        struct platform_device *dev = to_platform_device(_dev);
         struct flash_platform_data *plat = dev->dev.platform_data;
         struct resource *res = dev->resource;
         unsigned int size = res->end - res->start + 1;
@@ -138,7 +137,7 @@ static int armflash_probe(struct device *_dev)
         }
 
         if (err == 0)
-                dev_set_drvdata(&dev->dev, info);
+                platform_set_drvdata(dev, info);
 
         /*
          * If we got an error, free all resources.
@@ -163,12 +162,11 @@ static int armflash_probe(struct device *_dev)
         return err;
 }
 
-static int armflash_remove(struct device *_dev)
+static int armflash_remove(struct platform_device *dev)
 {
-        struct platform_device *dev = to_platform_device(_dev);
-        struct armflash_info *info = dev_get_drvdata(&dev->dev);
+        struct armflash_info *info = platform_get_drvdata(dev);
 
-        dev_set_drvdata(&dev->dev, NULL);
+        platform_set_drvdata(dev, NULL);
 
         if (info) {
                 if (info->mtd) {
@@ -190,21 +188,22 @@ static int armflash_remove(struct device *_dev)
         return 0;
 }
 
-static struct device_driver armflash_driver = {
-        .name           = "armflash",
-        .bus            = &platform_bus_type,
+static struct platform_driver armflash_driver = {
         .probe          = armflash_probe,
         .remove         = armflash_remove,
+        .driver         = {
+                .name   = "armflash",
+        },
 };
 
 static int __init armflash_init(void)
 {
-        return driver_register(&armflash_driver);
+        return platform_driver_register(&armflash_driver);
 }
 
 static void __exit armflash_exit(void)
 {
-        driver_unregister(&armflash_driver);
+        platform_driver_unregister(&armflash_driver);
 }
 
 module_init(armflash_init);
diff --git a/drivers/mtd/maps/ixp2000.c b/drivers/mtd/maps/ixp2000.c
index 641eb2b55e9f..fc7a78e31735 100644
--- a/drivers/mtd/maps/ixp2000.c
+++ b/drivers/mtd/maps/ixp2000.c
@@ -111,13 +111,12 @@ static void ixp2000_flash_copy_to(struct map_info *map, unsigned long to,
 }
 
 
-static int ixp2000_flash_remove(struct device *_dev)
+static int ixp2000_flash_remove(struct platform_device *dev)
 {
-        struct platform_device *dev = to_platform_device(_dev);
         struct flash_platform_data *plat = dev->dev.platform_data;
-        struct ixp2000_flash_info *info = dev_get_drvdata(&dev->dev);
+        struct ixp2000_flash_info *info = platform_get_drvdata(dev);
 
-        dev_set_drvdata(&dev->dev, NULL);
+        platform_set_drvdata(dev, NULL);
 
         if(!info)
                 return 0;
@@ -143,10 +142,9 @@ static int ixp2000_flash_remove(struct device *_dev)
 }
 
 
-static int ixp2000_flash_probe(struct device *_dev)
+static int ixp2000_flash_probe(struct platform_device *dev)
 {
         static const char *probes[] = { "RedBoot", "cmdlinepart", NULL };
-        struct platform_device *dev = to_platform_device(_dev);
         struct ixp2000_flash_data *ixp_data = dev->dev.platform_data;
         struct flash_platform_data *plat;
         struct ixp2000_flash_info *info;
@@ -177,7 +175,7 @@ static int ixp2000_flash_probe(struct device *_dev)
         }
         memzero(info, sizeof(struct ixp2000_flash_info));
 
-        dev_set_drvdata(&dev->dev, info);
+        platform_set_drvdata(dev, info);
 
         /*
          * Tell the MTD layer we're not 1:1 mapped so that it does
@@ -248,25 +246,26 @@ static int ixp2000_flash_probe(struct device *_dev)
         return 0;
 
 Error:
-        ixp2000_flash_remove(_dev);
+        ixp2000_flash_remove(dev);
         return err;
 }
 
-static struct device_driver ixp2000_flash_driver = {
-        .name           = "IXP2000-Flash",
-        .bus            = &platform_bus_type,
+static struct platform_driver ixp2000_flash_driver = {
         .probe          = &ixp2000_flash_probe,
         .remove         = &ixp2000_flash_remove
+        .driver         = {
+                .name   = "IXP2000-Flash",
+        },
 };
 
 static int __init ixp2000_flash_init(void)
 {
-        return driver_register(&ixp2000_flash_driver);
+        return platform_driver_register(&ixp2000_flash_driver);
 }
 
 static void __exit ixp2000_flash_exit(void)
 {
-        driver_unregister(&ixp2000_flash_driver);
+        platform_driver_unregister(&ixp2000_flash_driver);
 }
 
 module_init(ixp2000_flash_init);
diff --git a/drivers/mtd/maps/ixp4xx.c b/drivers/mtd/maps/ixp4xx.c
index 56b3a355bf7b..a59f8027903c 100644
--- a/drivers/mtd/maps/ixp4xx.c
+++ b/drivers/mtd/maps/ixp4xx.c
@@ -99,13 +99,12 @@ struct ixp4xx_flash_info {
 
 static const char *probes[] = { "RedBoot", "cmdlinepart", NULL };
 
-static int ixp4xx_flash_remove(struct device *_dev)
+static int ixp4xx_flash_remove(struct platform_device *dev)
 {
-        struct platform_device *dev = to_platform_device(_dev);
         struct flash_platform_data *plat = dev->dev.platform_data;
-        struct ixp4xx_flash_info *info = dev_get_drvdata(&dev->dev);
+        struct ixp4xx_flash_info *info = platform_get_drvdata(dev);
 
-        dev_set_drvdata(&dev->dev, NULL);
+        platform_set_drvdata(dev, NULL);
 
         if(!info)
                 return 0;
@@ -130,9 +129,8 @@ static int ixp4xx_flash_remove(struct device *_dev)
         return 0;
 }
 
-static int ixp4xx_flash_probe(struct device *_dev)
+static int ixp4xx_flash_probe(struct platform_device *dev)
 {
-        struct platform_device *dev = to_platform_device(_dev);
         struct flash_platform_data *plat = dev->dev.platform_data;
         struct ixp4xx_flash_info *info;
         int err = -1;
@@ -153,7 +151,7 @@ static int ixp4xx_flash_probe(struct device *_dev)
         }
         memzero(info, sizeof(struct ixp4xx_flash_info));
 
-        dev_set_drvdata(&dev->dev, info);
+        platform_set_drvdata(dev, info);
 
         /*
          * Tell the MTD layer we're not 1:1 mapped so that it does
@@ -214,25 +212,26 @@ static int ixp4xx_flash_probe(struct device *_dev)
         return 0;
 
 Error:
-        ixp4xx_flash_remove(_dev);
+        ixp4xx_flash_remove(dev);
         return err;
 }
 
-static struct device_driver ixp4xx_flash_driver = {
-        .name           = "IXP4XX-Flash",
-        .bus            = &platform_bus_type,
+static struct platform_driver ixp4xx_flash_driver = {
         .probe          = ixp4xx_flash_probe,
         .remove         = ixp4xx_flash_remove,
+        .driver         = {
+                .name   = "IXP4XX-Flash",
+        },
 };
 
 static int __init ixp4xx_flash_init(void)
 {
-        return driver_register(&ixp4xx_flash_driver);
+        return platform_driver_register(&ixp4xx_flash_driver);
 }
 
 static void __exit ixp4xx_flash_exit(void)
 {
-        driver_unregister(&ixp4xx_flash_driver);
+        platform_driver_unregister(&ixp4xx_flash_driver);
 }
 
 
diff --git a/drivers/mtd/maps/omap_nor.c b/drivers/mtd/maps/omap_nor.c
index fd3b4a5fc207..418afffb2d80 100644
--- a/drivers/mtd/maps/omap_nor.c
+++ b/drivers/mtd/maps/omap_nor.c
@@ -70,11 +70,10 @@ static void omap_set_vpp(struct map_info *map, int enable)
         }
 }
 
-static int __devinit omapflash_probe(struct device *dev)
+static int __devinit omapflash_probe(struct platform_device *pdev)
 {
         int err;
         struct omapflash_info *info;
-        struct platform_device *pdev = to_platform_device(dev);
         struct flash_platform_data *pdata = pdev->dev.platform_data;
         struct resource *res = pdev->resource;
         unsigned long size = res->end - res->start + 1;
@@ -119,7 +118,7 @@ static int __devinit omapflash_probe(struct device *dev)
 #endif
                 add_mtd_device(info->mtd);
 
-        dev_set_drvdata(&pdev->dev, info);
+        platform_set_drvdata(pdev, info);
 
         return 0;
 
@@ -133,12 +132,11 @@ out_free_info:
         return err;
 }
 
-static int __devexit omapflash_remove(struct device *dev)
+static int __devexit omapflash_remove(struct platform_device *pdev)
 {
-        struct platform_device *pdev = to_platform_device(dev);
-        struct omapflash_info *info = dev_get_drvdata(&pdev->dev);
+        struct omapflash_info *info = platform_get_drvdata(pdev);
 
-        dev_set_drvdata(&pdev->dev, NULL);
+        platform_set_drvdata(pdev, NULL);
 
         if (info) {
                 if (info->parts) {
@@ -155,21 +153,22 @@ static int __devexit omapflash_remove(struct device *dev)
         return 0;
 }
 
-static struct device_driver omapflash_driver = {
-        .name   = "omapflash",
-        .bus    = &platform_bus_type,
+static struct platform_driver omapflash_driver = {
         .probe  = omapflash_probe,
         .remove = __devexit_p(omapflash_remove),
+        .driver = {
+                .name   = "omapflash",
+        },
 };
 
 static int __init omapflash_init(void)
 {
-        return driver_register(&omapflash_driver);
+        return platform_driver_register(&omapflash_driver);
 }
 
 static void __exit omapflash_exit(void)
 {
-        driver_unregister(&omapflash_driver);
+        platform_driver_unregister(&omapflash_driver);
 }
 
 module_init(omapflash_init);
diff --git a/drivers/mtd/maps/plat-ram.c b/drivers/mtd/maps/plat-ram.c
index a02eed94a231..5d3c75451ca2 100644
--- a/drivers/mtd/maps/plat-ram.c
+++ b/drivers/mtd/maps/plat-ram.c
@@ -56,9 +56,9 @@ struct platram_info {
  * device private data to struct platram_info conversion
 */
 
-static inline struct platram_info *to_platram_info(struct device *dev)
+static inline struct platram_info *to_platram_info(struct platform_device *dev)
 {
-        return (struct platram_info *)dev_get_drvdata(dev);
+        return (struct platram_info *)platform_get_drvdata(dev);
 }
 
 /* platram_setrw
@@ -83,13 +83,13 @@ static inline void platram_setrw(struct platram_info *info, int to)
  * called to remove the device from the driver's control
 */
 
-static int platram_remove(struct device *dev)
+static int platram_remove(struct platform_device *pdev)
 {
-        struct platram_info *info = to_platram_info(dev);
+        struct platram_info *info = to_platram_info(pdev);
 
-        dev_set_drvdata(dev, NULL);
+        platform_set_drvdata(pdev, NULL);
 
-        dev_dbg(dev, "removing device\n");
+        dev_dbg(&pdev->dev, "removing device\n");
 
         if (info == NULL)
                 return 0;
@@ -130,61 +130,60 @@ static int platram_remove(struct device *dev)
  * driver is found.
 */
 
-static int platram_probe(struct device *dev)
+static int platram_probe(struct platform_device *pdev)
 {
-        struct platform_device *pd = to_platform_device(dev);
         struct platdata_mtd_ram *pdata;
         struct platram_info *info;
         struct resource *res;
         int err = 0;
 
-        dev_dbg(dev, "probe entered\n");
+        dev_dbg(&pdev->dev, "probe entered\n");
 
-        if (dev->platform_data == NULL) {
-                dev_err(dev, "no platform data supplied\n");
+        if (pdev->dev.platform_data == NULL) {
+                dev_err(&pdev->dev, "no platform data supplied\n");
                 err = -ENOENT;
                 goto exit_error;
         }
 
-        pdata = dev->platform_data;
+        pdata = pdev->dev.platform_data;
 
         info = kmalloc(sizeof(*info), GFP_KERNEL);
         if (info == NULL) {
-                dev_err(dev, "no memory for flash info\n");
+                dev_err(&pdev->dev, "no memory for flash info\n");
                 err = -ENOMEM;
                 goto exit_error;
         }
 
         memset(info, 0, sizeof(*info));
-        dev_set_drvdata(dev, info);
+        platform_set_drvdata(pdev, info);
 
-        info->dev = dev;
+        info->dev = &pdev->dev;
         info->pdata = pdata;
 
         /* get the resource for the memory mapping */
 
-        res = platform_get_resource(pd, IORESOURCE_MEM, 0);
+        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
 
         if (res == NULL) {
-                dev_err(dev, "no memory resource specified\n");
+                dev_err(&pdev->dev, "no memory resource specified\n");
                 err = -ENOENT;
                 goto exit_free;
         }
 
-        dev_dbg(dev, "got platform resource %p (0x%lx)\n", res, res->start);
+        dev_dbg(&pdev->dev, "got platform resource %p (0x%lx)\n", res, res->start);
 
         /* setup map parameters */
 
         info->map.phys = res->start;
         info->map.size = (res->end - res->start) + 1;
-        info->map.name = pdata->mapname != NULL ? pdata->mapname : (char *)pd->name;
+        info->map.name = pdata->mapname != NULL ? pdata->mapname : (char *)pdev->name;
         info->map.bankwidth = pdata->bankwidth;
 
         /* register our usage of the memory area */
 
-        info->area = request_mem_region(res->start, info->map.size, pd->name);
+        info->area = request_mem_region(res->start, info->map.size, pdev->name);
         if (info->area == NULL) {
-                dev_err(dev, "failed to request memory region\n");
+                dev_err(&pdev->dev, "failed to request memory region\n");
                 err = -EIO;
                 goto exit_free;
         }
@@ -192,23 +191,23 @@ static int platram_probe(struct device *dev)
         /* remap the memory area */
 
         info->map.virt = ioremap(res->start, info->map.size);
-        dev_dbg(dev, "virt %p, %lu bytes\n", info->map.virt, info->map.size);
+        dev_dbg(&pdev->dev, "virt %p, %lu bytes\n", info->map.virt, info->map.size);
 
         if (info->map.virt == NULL) {
-                dev_err(dev, "failed to ioremap() region\n");
+                dev_err(&pdev->dev, "failed to ioremap() region\n");
                 err = -EIO;
                 goto exit_free;
         }
 
         simple_map_init(&info->map);
 
-        dev_dbg(dev, "initialised map, probing for mtd\n");
+        dev_dbg(&pdev->dev, "initialised map, probing for mtd\n");
 
         /* probe for the right mtd map driver */
 
         info->mtd = do_map_probe("map_ram" , &info->map);
         if (info->mtd == NULL) {
-                dev_err(dev, "failed to probe for map_ram\n");
+                dev_err(&pdev->dev, "failed to probe for map_ram\n");
                 err = -ENOMEM;
                 goto exit_free;
         }
@@ -237,27 +236,28 @@ static int platram_probe(struct device *dev)
 #endif /* CONFIG_MTD_PARTITIONS */
 
         if (add_mtd_device(info->mtd)) {
-                dev_err(dev, "add_mtd_device() failed\n");
+                dev_err(&pdev->dev, "add_mtd_device() failed\n");
                 err = -ENOMEM;
         }
 
-        dev_info(dev, "registered mtd device\n");
+        dev_info(&pdev->dev, "registered mtd device\n");
         return err;
 
  exit_free:
-        platram_remove(dev);
+        platram_remove(pdev);
  exit_error:
         return err;
 }
 
 /* device driver info */
 
-static struct device_driver platram_driver = {
-        .name           = "mtd-ram",
-        .owner          = THIS_MODULE,
-        .bus            = &platform_bus_type,
+static struct platform_driver platram_driver = {
         .probe          = platram_probe,
         .remove         = platram_remove,
+        .driver         = {
+                .name   = "mtd-ram",
+                .owner  = THIS_MODULE,
+        },
 };
 
 /* module init/exit */
@@ -265,12 +265,12 @@ static struct device_driver platram_driver = {
 static int __init platram_init(void)
 {
         printk("Generic platform RAM MTD, (c) 2004 Simtec Electronics\n");
-        return driver_register(&platram_driver);
+        return platform_driver_register(&platram_driver);
 }
 
 static void __exit platram_exit(void)
 {
-        driver_unregister(&platram_driver);
+        platform_driver_unregister(&platram_driver);
 }
 
 module_init(platram_init);
diff --git a/drivers/mtd/maps/sa1100-flash.c b/drivers/mtd/maps/sa1100-flash.c
index 9e8bb1782be0..5cefb015633c 100644
--- a/drivers/mtd/maps/sa1100-flash.c
+++ b/drivers/mtd/maps/sa1100-flash.c
@@ -356,9 +356,8 @@ sa1100_setup_mtd(struct platform_device *pdev, struct flash_platform_data *plat)
 
 static const char *part_probes[] = { "cmdlinepart", "RedBoot", NULL };
 
-static int __init sa1100_mtd_probe(struct device *dev)
+static int __init sa1100_mtd_probe(struct platform_device *pdev)
 {
-        struct platform_device *pdev = to_platform_device(dev);
         struct flash_platform_data *plat = pdev->dev.platform_data;
         struct mtd_partition *parts;
         const char *part_type = NULL;
@@ -402,28 +401,28 @@ static int __init sa1100_mtd_probe(struct device *dev)
 
         info->nr_parts = nr_parts;
 
-        dev_set_drvdata(dev, info);
+        platform_set_drvdata(pdev, info);
         err = 0;
 
  out:
         return err;
 }
 
-static int __exit sa1100_mtd_remove(struct device *dev)
+static int __exit sa1100_mtd_remove(struct platform_device *pdev)
 {
-        struct sa_info *info = dev_get_drvdata(dev);
-        struct flash_platform_data *plat = dev->platform_data;
+        struct sa_info *info = platform_get_drvdata(pdev);
+        struct flash_platform_data *plat = pdev->dev.platform_data;
 
-        dev_set_drvdata(dev, NULL);
+        platform_set_drvdata(pdev, NULL);
         sa1100_destroy(info, plat);
 
         return 0;
 }
 
 #ifdef CONFIG_PM
-static int sa1100_mtd_suspend(struct device *dev, pm_message_t state)
+static int sa1100_mtd_suspend(struct platform_device *dev, pm_message_t state)
 {
-        struct sa_info *info = dev_get_drvdata(dev);
+        struct sa_info *info = platform_get_drvdata(dev);
         int ret = 0;
 
         if (info)
@@ -432,17 +431,17 @@ static int sa1100_mtd_suspend(struct device *dev, pm_message_t state)
         return ret;
 }
 
-static int sa1100_mtd_resume(struct device *dev)
+static int sa1100_mtd_resume(struct platform_device *dev)
 {
-        struct sa_info *info = dev_get_drvdata(dev);
+        struct sa_info *info = platform_get_drvdata(dev);
         if (info)
                 info->mtd->resume(info->mtd);
         return 0;
 }
 
-static void sa1100_mtd_shutdown(struct device *dev)
+static void sa1100_mtd_shutdown(struct platform_device *dev)
 {
-        struct sa_info *info = dev_get_drvdata(dev);
+        struct sa_info *info = platform_get_drvdata(dev);
         if (info && info->mtd->suspend(info->mtd) == 0)
                 info->mtd->resume(info->mtd);
 }
@@ -452,24 +451,25 @@ static void sa1100_mtd_shutdown(struct device *dev)
 #define sa1100_mtd_shutdown NULL
 #endif
 
-static struct device_driver sa1100_mtd_driver = {
-        .name           = "flash",
-        .bus            = &platform_bus_type,
+static struct platform_driver sa1100_mtd_driver = {
         .probe          = sa1100_mtd_probe,
         .remove         = __exit_p(sa1100_mtd_remove),
         .suspend        = sa1100_mtd_suspend,
         .resume         = sa1100_mtd_resume,
         .shutdown       = sa1100_mtd_shutdown,
+        .driver         = {
+                .name   = "flash",
+        },
 };
 
 static int __init sa1100_mtd_init(void)
 {
-        return driver_register(&sa1100_mtd_driver);
+        return platform_driver_register(&sa1100_mtd_driver);
 }
 
 static void __exit sa1100_mtd_exit(void)
 {
-        driver_unregister(&sa1100_mtd_driver);
+        platform_driver_unregister(&sa1100_mtd_driver);
 }
 
 module_init(sa1100_mtd_init);