crypto: caam - platform_bus_type migration
authorKim Phillips <kim.phillips@freescale.com>
Sun, 15 May 2011 03:07:55 +0000 (22:07 -0500)
committerHerbert Xu <herbert@gondor.apana.org.au>
Thu, 19 May 2011 04:37:58 +0000 (14:37 +1000)
this fixes a build error since cryptodev-2.6 got rebased
to include commit d714d1979d7b4df7e2c127407f4014ce71f73cd0
"dt: eliminate of_platform_driver shim code".

Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
drivers/crypto/caam/ctrl.c

index 59aae4e3b54b158bed3171596d19e87b964b09f5..9009713a3c2e579ee4f2ff99ceb847bad77935ca 100644 (file)
@@ -44,8 +44,7 @@ static int caam_remove(struct platform_device *pdev)
 }
 
 /* Probe routine for CAAM top (controller) level */
-static int caam_probe(struct platform_device *pdev,
-                     const struct of_device_id *devmatch)
+static int caam_probe(struct platform_device *pdev)
 {
        int d, ring, rspec;
        struct device *dev;
@@ -242,7 +241,7 @@ static struct of_device_id caam_match[] = {
 };
 MODULE_DEVICE_TABLE(of, caam_match);
 
-static struct of_platform_driver caam_driver = {
+static struct platform_driver caam_driver = {
        .driver = {
                .name = "caam",
                .owner = THIS_MODULE,
@@ -254,12 +253,12 @@ static struct of_platform_driver caam_driver = {
 
 static int __init caam_base_init(void)
 {
-       return of_register_platform_driver(&caam_driver);
+       return platform_driver_register(&caam_driver);
 }
 
 static void __exit caam_base_exit(void)
 {
-       return of_unregister_platform_driver(&caam_driver);
+       return platform_driver_unregister(&caam_driver);
 }
 
 module_init(caam_base_init);