Skip to content

Commit

Permalink
crypto: caam - platform_bus_type migration
Browse files Browse the repository at this point in the history
this fixes a build error since cryptodev-2.6 got rebased
to include commit d714d19
"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>
  • Loading branch information
Kim Phillips authored and Herbert Xu committed May 19, 2011
1 parent 9bed4ac commit 2930d49
Showing 1 changed file with 4 additions and 5 deletions.
9 changes: 4 additions & 5 deletions drivers/crypto/caam/ctrl.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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,
Expand All @@ -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);
Expand Down

0 comments on commit 2930d49

Please sign in to comment.