Merge remote-tracking branch 'grant/devicetree/next' into for-next

3 files changed, 3 insertions, 3 deletions

diff --git a/drivers/crypto/caam/ctrl.c b/drivers/crypto/caam/ctrl.c
index 30548701665c..bc6d820812b6 100644
--- a/drivers/crypto/caam/ctrl.c
+++ b/drivers/crypto/caam/ctrl.c
@@ -227,7 +227,7 @@ static int caam_probe(struct platform_device *pdev)
         topregs = (struct caam_full __iomem *)ctrl;
 
         /* Get the IRQ of the controller (for security violations only) */
-        ctrlpriv->secvio_irq = of_irq_to_resource(nprop, 0, NULL);
+        ctrlpriv->secvio_irq = irq_of_parse_and_map(nprop, 0);
 
         /*
          * Enable DECO watchdogs and, if this is a PHYS_ADDR_T_64BIT kernel,
diff --git a/drivers/crypto/caam/jr.c b/drivers/crypto/caam/jr.c
index 94b80a937647..bdb786d5a5e5 100644
--- a/drivers/crypto/caam/jr.c
+++ b/drivers/crypto/caam/jr.c
@@ -405,7 +405,7 @@ int caam_jr_probe(struct platform_device *pdev, struct device_node *np,
                 dma_set_mask(jrdev, DMA_BIT_MASK(32));
 
         /* Identify the interrupt */
-        jrpriv->irq = of_irq_to_resource(np, 0, NULL);
+        jrpriv->irq = irq_of_parse_and_map(np, 0);
 
         /* Now do the platform independent part */
         error = caam_jr_init(jrdev); /* now turn on hardware */
diff --git a/drivers/crypto/omap-sham.c b/drivers/crypto/omap-sham.c
index 8bdde57f6bb1..e28104b4aab0 100644
--- a/drivers/crypto/omap-sham.c
+++ b/drivers/crypto/omap-sham.c
@@ -1818,7 +1818,7 @@ static int omap_sham_get_res_of(struct omap_sham_dev *dd,
                 goto err;
         }
 
-        dd->irq = of_irq_to_resource(node, 0, NULL);
+        dd->irq = irq_of_parse_and_map(node, 0);
         if (!dd->irq) {
                 dev_err(dev, "can't translate OF irq value\n");
                 err = -EINVAL;