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, 19 insertions, 9 deletions

diff --git a/drivers/char/tpm/tpm_atmel.c b/drivers/char/tpm/tpm_atmel.c
index d0e7926eb486..c64a1bc65349 100644
--- a/drivers/char/tpm/tpm_atmel.c
+++ b/drivers/char/tpm/tpm_atmel.c
@@ -168,12 +168,22 @@ static void atml_plat_remove(void)
         }
 }
 
-static struct device_driver atml_drv = {
-        .name = "tpm_atmel",
-        .bus = &platform_bus_type,
-        .owner = THIS_MODULE,
-        .suspend = tpm_pm_suspend,
-        .resume = tpm_pm_resume,
+static int tpm_atml_suspend(struct platform_device *dev, pm_message_t msg)
+{
+        return tpm_pm_suspend(&dev->dev, msg);
+}
+
+static int tpm_atml_resume(struct platform_device *dev)
+{
+        return tpm_pm_resume(&dev->dev);
+}
+static struct platform_driver atml_drv = {
+        .driver = {
+                .name = "tpm_atmel",
+                .owner          = THIS_MODULE,
+        },
+        .suspend = tpm_atml_suspend,
+        .resume = tpm_atml_resume,
 };
 
 static int __init init_atmel(void)
@@ -184,7 +194,7 @@ static int __init init_atmel(void)
         unsigned long base;
         struct  tpm_chip *chip;
 
-        rc = driver_register(&atml_drv);
+        rc = platform_driver_register(&atml_drv);
         if (rc)
                 return rc;
 
@@ -223,13 +233,13 @@ err_rel_reg:
                 atmel_release_region(base,
                                      region_size);
 err_unreg_drv:
-        driver_unregister(&atml_drv);
+        platform_driver_unregister(&atml_drv);
         return rc;
 }
 
 static void __exit cleanup_atmel(void)
 {
-        driver_unregister(&atml_drv);
+        platform_driver_unregister(&atml_drv);
         atml_plat_remove();
 }