diff options
| author | Kim Phillips <kim.phillips@freescale.com> | 2011-05-14 22:07:55 -0500 |
|---|---|---|
| committer | Herbert Xu <herbert@gondor.apana.org.au> | 2011-05-19 14:37:58 +1000 |
| commit | 2930d49768e5276da4fbed9d9cc1bd40ed25818e (patch) | |
| tree | 553bbd7cfcde38858222ff275f4f85d54b6dda18 /drivers | |
| parent | 9bed4aca296fdf9c1b85a8f093e92018dc9864f3 (diff) | |
| download | kernel_samsung_tuna-2930d49768e5276da4fbed9d9cc1bd40ed25818e.zip kernel_samsung_tuna-2930d49768e5276da4fbed9d9cc1bd40ed25818e.tar.gz kernel_samsung_tuna-2930d49768e5276da4fbed9d9cc1bd40ed25818e.tar.bz2 | |
crypto: caam - platform_bus_type migration
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>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/crypto/caam/ctrl.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/crypto/caam/ctrl.c b/drivers/crypto/caam/ctrl.c index 59aae4e..9009713 100644 --- a/drivers/crypto/caam/ctrl.c +++ b/drivers/crypto/caam/ctrl.c @@ -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); |