media: camss: Use platform_get_irq_byname() to get the interrupt

platform_get_resource_byname(pdev, IORESOURCE_IRQ, ..) relies on static
allocation of IRQ resources in DT core code, this causes an issue
when using hierarchical interrupt domains using "interrupts" property
in the node as this bypasses the hierarchical setup and messes up the
irq chaining.

In preparation for removal of static setup of IRQ resource from DT core
code use platform_get_irq_byname().

Signed-off-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>

diff --git a/drivers/media/platform/qcom/camss/camss-csid.c b/drivers/media/platform/qcom/camss/camss-csid.c
index 32f82e471bae1495fb856512afd90f7b7bbc7ebe..97e0dc3f0cdb35709d98141e82ef9476c41b9ede 100644 (file)
--- a/drivers/media/platform/qcom/camss/camss-csid.c
+++ b/drivers/media/platform/qcom/camss/camss-csid.c
@@ -562,7 +562,6 @@ int msm_csid_subdev_init(struct camss *camss, struct csid_device *csid,
 {
        struct device *dev = camss->dev;
        struct platform_device *pdev = to_platform_device(dev);
-       struct resource *r;
        int i, j;
        int ret;
 
@@ -601,14 +600,11 @@ int msm_csid_subdev_init(struct camss *camss, struct csid_device *csid,
 
        /* Interrupt */
 
-       r = platform_get_resource_byname(pdev, IORESOURCE_IRQ,
-                                        res->interrupt[0]);
-       if (!r) {
-               dev_err(dev, "missing IRQ\n");
-               return -EINVAL;
-       }
+       ret = platform_get_irq_byname(pdev, res->interrupt[0]);
+       if (ret < 0)
+               return ret;
 
-       csid->irq = r->start;
+       csid->irq = ret;
        snprintf(csid->irq_name, sizeof(csid->irq_name), "%s_%s%d",
                 dev_name(dev), MSM_CSID_NAME, csid->id);
        ret = devm_request_irq(dev, csid->irq, csid->ops->isr,

diff --git a/drivers/media/platform/qcom/camss/camss-csiphy.c b/drivers/media/platform/qcom/camss/camss-csiphy.c
index f1d8d883af8e7087344762e705d0d15a9e454dec..445e60e539562fd58cc965baff6602306cff2c0c 100644 (file)
--- a/drivers/media/platform/qcom/camss/camss-csiphy.c
+++ b/drivers/media/platform/qcom/camss/camss-csiphy.c
@@ -569,7 +569,6 @@ int msm_csiphy_subdev_init(struct camss *camss,
 {
        struct device *dev = camss->dev;
        struct platform_device *pdev = to_platform_device(dev);
-       struct resource *r;
        int i, j;
        int ret;
 
@@ -613,14 +612,11 @@ int msm_csiphy_subdev_init(struct camss *camss,
 
        /* Interrupt */
 
-       r = platform_get_resource_byname(pdev, IORESOURCE_IRQ,
-                                        res->interrupt[0]);
-       if (!r) {
-               dev_err(dev, "missing IRQ\n");
-               return -EINVAL;
-       }
+       ret = platform_get_irq_byname(pdev, res->interrupt[0]);
+       if (ret < 0)
+               return ret;
 
-       csiphy->irq = r->start;
+       csiphy->irq = ret;
        snprintf(csiphy->irq_name, sizeof(csiphy->irq_name), "%s_%s%d",
                 dev_name(dev), MSM_CSIPHY_NAME, csiphy->id);
 

diff --git a/drivers/media/platform/qcom/camss/camss-ispif.c b/drivers/media/platform/qcom/camss/camss-ispif.c
index ba5d65f6ef34b67f418eda983d2f3332857b53c7..4ee11bb979cde58177257be114ccaa3518238296 100644 (file)
--- a/drivers/media/platform/qcom/camss/camss-ispif.c
+++ b/drivers/media/platform/qcom/camss/camss-ispif.c
@@ -1100,7 +1100,6 @@ int msm_ispif_subdev_init(struct camss *camss,
        struct device *dev = camss->dev;
        struct ispif_device *ispif = camss->ispif;
        struct platform_device *pdev = to_platform_device(dev);
-       struct resource *r;
        int i;
        int ret;
 
@@ -1153,14 +1152,11 @@ int msm_ispif_subdev_init(struct camss *camss,
 
        /* Interrupt */
 
-       r = platform_get_resource_byname(pdev, IORESOURCE_IRQ, res->interrupt);
-
-       if (!r) {
-               dev_err(dev, "missing IRQ\n");
-               return -EINVAL;
-       }
+       ret = platform_get_irq_byname(pdev, res->interrupt);
+       if (ret < 0)
+               return ret;
 
-       ispif->irq = r->start;
+       ispif->irq = ret;
        snprintf(ispif->irq_name, sizeof(ispif->irq_name), "%s_%s",
                 dev_name(dev), MSM_ISPIF_NAME);
        if (camss->version == CAMSS_8x16)

diff --git a/drivers/media/platform/qcom/camss/camss-vfe.c b/drivers/media/platform/qcom/camss/camss-vfe.c
index 703ea39f126281ab4a530ddad01a60fbc756d3e8..5b148e9f8134dbc35ff962c1901d9b77d66684f1 100644 (file)
--- a/drivers/media/platform/qcom/camss/camss-vfe.c
+++ b/drivers/media/platform/qcom/camss/camss-vfe.c
@@ -1281,7 +1281,6 @@ int msm_vfe_subdev_init(struct camss *camss, struct vfe_device *vfe,
 {
        struct device *dev = camss->dev;
        struct platform_device *pdev = to_platform_device(dev);
-       struct resource *r;
        int i, j;
        int ret;
 
@@ -1316,14 +1315,11 @@ int msm_vfe_subdev_init(struct camss *camss, struct vfe_device *vfe,
 
        /* Interrupt */
 
-       r = platform_get_resource_byname(pdev, IORESOURCE_IRQ,
-                                        res->interrupt[0]);
-       if (!r) {
-               dev_err(dev, "missing IRQ\n");
-               return -EINVAL;
-       }
+       ret = platform_get_irq_byname(pdev, res->interrupt[0]);
+       if (ret < 0)
+               return ret;
 
-       vfe->irq = r->start;
+       vfe->irq = ret;
        snprintf(vfe->irq_name, sizeof(vfe->irq_name), "%s_%s%d",
                 dev_name(dev), MSM_VFE_NAME, id);
        ret = devm_request_irq(dev, vfe->irq, vfe->ops->isr,