platform driver: fix incorrect use of 'platform_bus_type' with 'struct device_driver'

This patch fixes the bug reported in
	http://bugzilla.kernel.org/show_bug.cgi?id=11681.

"Lots of device drivers register a 'struct device_driver' with
the '.bus' member set to '&platform_bus_type'. This is wrong,
since the platform_bus functions expect the 'struct device_driver'
to be wrapped up in a 'struct platform_driver' which provides
some additional callbacks (like suspend_late, resume_early).
The effect may be that platform_suspend_late() uses bogus data
outside the device_driver struct as a pointer pointer to the
device driver's suspend_late() function or other hard to
reproduce failures."(Lothar Wassmann)

Signed-off-by: Ming Lei <tom.leiming@gmail.com>
Acked-by: Henrique de Moraes Holschuh <hmh@hmh.eng.br>
Acked-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

1 files changed, 18 insertions, 18 deletions

diff --git a/drivers/ide/au1xxx-ide.c b/drivers/ide/au1xxx-ide.c
index 79a2dfed8eb7..154ec2cf734f 100644
--- a/drivers/ide/au1xxx-ide.c
+++ b/drivers/ide/au1xxx-ide.c
@@ -536,9 +536,8 @@ static const struct ide_port_info au1xxx_port_info = {
 #endif
 };
 
-static int au_ide_probe(struct device *dev)
+static int au_ide_probe(struct platform_device *dev)
 {
-        struct platform_device *pdev = to_platform_device(dev);
         _auide_hwif *ahwif = &auide_hwif;
         struct resource *res;
         struct ide_host *host;
@@ -552,23 +551,23 @@ static int au_ide_probe(struct device *dev)
 #endif
 
         memset(&auide_hwif, 0, sizeof(_auide_hwif));
-        ahwif->irq = platform_get_irq(pdev, 0);
+        ahwif->irq = platform_get_irq(dev, 0);
 
-        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        res = platform_get_resource(dev, IORESOURCE_MEM, 0);
 
         if (res == NULL) {
-                pr_debug("%s %d: no base address\n", DRV_NAME, pdev->id);
+                pr_debug("%s %d: no base address\n", DRV_NAME, dev->id);
                 ret = -ENODEV;
                 goto out;
         }
         if (ahwif->irq < 0) {
-                pr_debug("%s %d: no IRQ\n", DRV_NAME, pdev->id);
+                pr_debug("%s %d: no IRQ\n", DRV_NAME, dev->id);
                 ret = -ENODEV;
                 goto out;
         }
 
         if (!request_mem_region(res->start, res->end - res->start + 1,
-                                pdev->name)) {
+                                dev->name)) {
                 pr_debug("%s: request_mem_region failed\n", DRV_NAME);
                 ret =  -EBUSY;
                 goto out;
@@ -583,7 +582,7 @@ static int au_ide_probe(struct device *dev)
         memset(&hw, 0, sizeof(hw));
         auide_setup_ports(&hw, ahwif);
         hw.irq = ahwif->irq;
-        hw.dev = dev;
+        hw.dev = &dev->dev;
         hw.chipset = ide_au1xxx;
 
         ret = ide_host_add(&au1xxx_port_info, hws, &host);
@@ -592,7 +591,7 @@ static int au_ide_probe(struct device *dev)
 
         auide_hwif.hwif = host->ports[0];
 
-        dev_set_drvdata(dev, host);
+        platform_set_drvdata(dev, host);
 
         printk(KERN_INFO "Au1xxx IDE(builtin) configured for %s\n", mode );
 
@@ -600,38 +599,39 @@ static int au_ide_probe(struct device *dev)
         return ret;
 }
 
-static int au_ide_remove(struct device *dev)
+static int au_ide_remove(struct platform_device *dev)
 {
-        struct platform_device *pdev = to_platform_device(dev);
         struct resource *res;
-        struct ide_host *host = dev_get_drvdata(dev);
+        struct ide_host *host = platform_get_drvdata(dev);
         _auide_hwif *ahwif = &auide_hwif;
 
         ide_host_remove(host);
 
         iounmap((void *)ahwif->regbase);
 
-        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        res = platform_get_resource(dev, IORESOURCE_MEM, 0);
         release_mem_region(res->start, res->end - res->start + 1);
 
         return 0;
 }
 
-static struct device_driver au1200_ide_driver = {
-        .name           = "au1200-ide",
-        .bus            = &platform_bus_type,
+static struct platform_driver au1200_ide_driver = {
+        .driver = {
+                .name           = "au1200-ide",
+                .owner          = THIS_MODULE,
+        },
         .probe          = au_ide_probe,
         .remove         = au_ide_remove,
 };
 
 static int __init au_ide_init(void)
 {
-        return driver_register(&au1200_ide_driver);
+        return platform_driver_register(&au1200_ide_driver);
 }
 
 static void __exit au_ide_exit(void)
 {
-        driver_unregister(&au1200_ide_driver);
+        platform_driver_unregister(&au1200_ide_driver);
 }
 
 MODULE_LICENSE("GPL");