media: camss: move to use request_irq by IRQF_NO_AUTOEN flag

disable_irq() after request_irq() still has a time gap in which
interrupts can come. request_irq() with IRQF_NO_AUTOEN flag will
disable IRQ auto-enable because of requesting.

this patch is made base on "add IRQF_NO_AUTOEN for request_irq" which
is being merged: https://lore.kernel.org/patchwork/patch/1388765/

Signed-off-by: Tian Tao <tiantao6@hisilicon.com>
Reviewed-by: Robert Foss <robert.foss@linaro.org>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

diff --git a/drivers/media/platform/qcom/camss/camss-csid.c b/drivers/media/platform/qcom/camss/camss-csid.c
index 7e2490c..251f4c4 100644 (file)
--- a/drivers/media/platform/qcom/camss/camss-csid.c
+++ b/drivers/media/platform/qcom/camss/camss-csid.c
@@ -581,14 +581,13 @@ int msm_csid_subdev_init(struct camss *camss, struct csid_device *csid,
        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,
-                              IRQF_TRIGGER_RISING, csid->irq_name, csid);
+                              IRQF_TRIGGER_RISING | IRQF_NO_AUTOEN,
+                              csid->irq_name, csid);
        if (ret < 0) {
                dev_err(dev, "request_irq failed: %d\n", ret);
                return ret;
        }
 
-       disable_irq(csid->irq);
-
        /* Clocks */
 
        csid->nclocks = 0;

diff --git a/drivers/media/platform/qcom/camss/camss-csiphy.c b/drivers/media/platform/qcom/camss/camss-csiphy.c
index b623e00..35470cb 100644 (file)
--- a/drivers/media/platform/qcom/camss/camss-csiphy.c
+++ b/drivers/media/platform/qcom/camss/camss-csiphy.c
@@ -617,14 +617,13 @@ int msm_csiphy_subdev_init(struct camss *camss,
                 dev_name(dev), MSM_CSIPHY_NAME, csiphy->id);
 
        ret = devm_request_irq(dev, csiphy->irq, csiphy->ops->isr,
-                              IRQF_TRIGGER_RISING, csiphy->irq_name, csiphy);
+                              IRQF_TRIGGER_RISING | IRQF_NO_AUTOEN,
+                              csiphy->irq_name, csiphy);
        if (ret < 0) {
                dev_err(dev, "request_irq failed: %d\n", ret);
                return ret;
        }
 
-       disable_irq(csiphy->irq);
-
        /* Clocks */
 
        csiphy->nclocks = 0;