diff options
| author | Victoria Milhoan <vicki.milhoan@freescale.com> | 2014-12-08 15:06:38 -0700 |
|---|---|---|
| committer | Jason Liu <r64343@freescale.com> | 2014-12-22 13:03:46 +0800 |
| commit | 6856f4ea8b8983f2214c325e9a04219f0d43c414 (patch) | |
| tree | 084fcfcd5e2cb4202c086b398430a8a922183db1 | |
| parent | 53a7b1f8c0b157cc0bf672379859f335e80baaae (diff) | |
MLK-9972 crypto: caam - Replace of_irq_to_resource() with irq_of_parse_and_map()
Replace instances of of_irq_to_resource() with the simpler
equivalent irq_of_parse_and_map(). A similar patch was applied
previously, but lost due to later patches. Based on
upstream commit f7578496a671a96e501f16a5104893275e32c33a.
Signed-off-by: Victoria Milhoan <vicki.milhoan@freescale.com>
(cherry picked from commit 9758f15682435ed7edbc98e02c01263e9f64f3c9)
| -rw-r--r-- | drivers/crypto/caam/jr.c | 2 | ||||
| -rw-r--r-- | drivers/crypto/caam/secvio.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/crypto/caam/jr.c b/drivers/crypto/caam/jr.c index c3e26598d685..d62448c73231 100644 --- a/drivers/crypto/caam/jr.c +++ b/drivers/crypto/caam/jr.c @@ -503,7 +503,7 @@ static int caam_jr_probe(struct platform_device *pdev) dma_set_mask(jrdev, DMA_BIT_MASK(32)); /* Identify the interrupt */ - jrpriv->irq = of_irq_to_resource(nprop, 0, NULL); + jrpriv->irq = irq_of_parse_and_map(nprop, 0); if (jrpriv->irq <= 0) { kfree(jrpriv); return -EINVAL; diff --git a/drivers/crypto/caam/secvio.c b/drivers/crypto/caam/secvio.c index 2505cdc9fb8b..e4e5341e41b8 100644 --- a/drivers/crypto/caam/secvio.c +++ b/drivers/crypto/caam/secvio.c @@ -212,7 +212,7 @@ static int snvs_secvio_probe(struct platform_device *pdev) kfree(svpriv); return -EINVAL; } - svpriv->irq = of_irq_to_resource(npirq, 0, NULL); + svpriv->irq = irq_of_parse_and_map(npirq, 0); snvsregs = of_iomap(np, 0); if (!snvsregs) { |