aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorKim Phillips <kim.phillips@freescale.com>2011-05-14 23:07:55 -0400
committerHerbert Xu <herbert@gondor.apana.org.au>2011-05-19 00:37:58 -0400
commit2930d49768e5276da4fbed9d9cc1bd40ed25818e (patch)
tree553bbd7cfcde38858222ff275f4f85d54b6dda18 /drivers
parent9bed4aca296fdf9c1b85a8f093e92018dc9864f3 (diff)
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.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/crypto/caam/ctrl.c b/drivers/crypto/caam/ctrl.c
index 59aae4e3b54b..9009713a3c2e 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)
44} 44}
45 45
46/* Probe routine for CAAM top (controller) level */ 46/* Probe routine for CAAM top (controller) level */
47static int caam_probe(struct platform_device *pdev, 47static int caam_probe(struct platform_device *pdev)
48 const struct of_device_id *devmatch)
49{ 48{
50 int d, ring, rspec; 49 int d, ring, rspec;
51 struct device *dev; 50 struct device *dev;
@@ -242,7 +241,7 @@ static struct of_device_id caam_match[] = {
242}; 241};
243MODULE_DEVICE_TABLE(of, caam_match); 242MODULE_DEVICE_TABLE(of, caam_match);
244 243
245static struct of_platform_driver caam_driver = { 244static struct platform_driver caam_driver = {
246 .driver = { 245 .driver = {
247 .name = "caam", 246 .name = "caam",
248 .owner = THIS_MODULE, 247 .owner = THIS_MODULE,
@@ -254,12 +253,12 @@ static struct of_platform_driver caam_driver = {
254 253
255static int __init caam_base_init(void) 254static int __init caam_base_init(void)
256{ 255{
257 return of_register_platform_driver(&caam_driver); 256 return platform_driver_register(&caam_driver);
258} 257}
259 258
260static void __exit caam_base_exit(void) 259static void __exit caam_base_exit(void)
261{ 260{
262 return of_unregister_platform_driver(&caam_driver); 261 return platform_driver_unregister(&caam_driver);
263} 262}
264 263
265module_init(caam_base_init); 264module_init(caam_base_init);