From 9fcb700420c90c4dc38bb81cf73f078a6b4d2dcc Mon Sep 17 00:00:00 2001 From: Lad Prabhakar Date: Tue, 11 Jan 2022 01:23:04 +0100 Subject: [PATCH] media: bdisp: Use platform_get_irq() to get the interrupt platform_get_resource(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(). Signed-off-by: Lad Prabhakar Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab --- drivers/media/platform/sti/bdisp/bdisp-v4l2.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/drivers/media/platform/sti/bdisp/bdisp-v4l2.c b/drivers/media/platform/sti/bdisp/bdisp-v4l2.c index 01ce7b7117743..5aa79d9277c88 100644 --- a/drivers/media/platform/sti/bdisp/bdisp-v4l2.c +++ b/drivers/media/platform/sti/bdisp/bdisp-v4l2.c @@ -1284,7 +1284,6 @@ static int bdisp_remove(struct platform_device *pdev) static int bdisp_probe(struct platform_device *pdev) { struct bdisp_dev *bdisp; - struct resource *res; struct device *dev = &pdev->dev; int ret; @@ -1335,14 +1334,11 @@ static int bdisp_probe(struct platform_device *pdev) goto err_wq; } - res = platform_get_resource(pdev, IORESOURCE_IRQ, 0); - if (!res) { - dev_err(dev, "failed to get IRQ resource\n"); - ret = -EINVAL; + ret = platform_get_irq(pdev, 0); + if (ret < 0) goto err_clk; - } - ret = devm_request_threaded_irq(dev, res->start, bdisp_irq_handler, + ret = devm_request_threaded_irq(dev, ret, bdisp_irq_handler, bdisp_irq_thread, IRQF_ONESHOT, pdev->name, bdisp); if (ret) { -- 2.30.2