diff options
author | Mark Brown <broonie@linaro.org> | 2013-12-18 18:24:24 +0100 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2013-12-18 18:24:41 +0100 |
commit | d1c8b1bd093cb57860fb6446e096e1c1cda92d4d (patch) | |
tree | 9c93ddf1ced6064a7f75a3f8a3691d09e624edb9 /drivers/crypto/caam/caamrng.c | |
parent | regulator: s5m8767: Do not use sec_reg* regmap helpers (diff) | |
parent | mfd: s2mps11: Fix build after regmap field rename in sec-core.c (diff) | |
download | linux-d1c8b1bd093cb57860fb6446e096e1c1cda92d4d.tar.xz linux-d1c8b1bd093cb57860fb6446e096e1c1cda92d4d.zip |
Merge tag 's2mps11-build' into regulator-s5m8767 since a following patch
depend on it.
regulator/clk: Fix s2mps11 build
This patch fixes a build failure that appeared in v3.13-rc4 due to an
RTC/MFD update merged via -mm.
Diffstat (limited to 'drivers/crypto/caam/caamrng.c')
-rw-r--r-- | drivers/crypto/caam/caamrng.c | 29 |
1 files changed, 9 insertions, 20 deletions
diff --git a/drivers/crypto/caam/caamrng.c b/drivers/crypto/caam/caamrng.c index d1939a9539c0..28486b19fc36 100644 --- a/drivers/crypto/caam/caamrng.c +++ b/drivers/crypto/caam/caamrng.c @@ -273,34 +273,23 @@ static struct hwrng caam_rng = { static void __exit caam_rng_exit(void) { + caam_jr_free(rng_ctx.jrdev); hwrng_unregister(&caam_rng); } static int __init caam_rng_init(void) { - struct device_node *dev_node; - struct platform_device *pdev; - struct device *ctrldev; - struct caam_drv_private *priv; - - dev_node = of_find_compatible_node(NULL, NULL, "fsl,sec-v4.0"); - if (!dev_node) { - dev_node = of_find_compatible_node(NULL, NULL, "fsl,sec4.0"); - if (!dev_node) - return -ENODEV; - } - - pdev = of_find_device_by_node(dev_node); - if (!pdev) - return -ENODEV; + struct device *dev; - ctrldev = &pdev->dev; - priv = dev_get_drvdata(ctrldev); - of_node_put(dev_node); + dev = caam_jr_alloc(); + if (IS_ERR(dev)) { + pr_err("Job Ring Device allocation for transform failed\n"); + return PTR_ERR(dev); + } - caam_init_rng(&rng_ctx, priv->jrdev[0]); + caam_init_rng(&rng_ctx, dev); - dev_info(priv->jrdev[0], "registering rng-caam\n"); + dev_info(dev, "registering rng-caam\n"); return hwrng_register(&caam_rng); } |