* [PATCH] watchdog: s3c2410: Use platform_get_irq() to get the interrupt
@ 2021-12-16 18:36 Lad Prabhakar
2021-12-16 19:01 ` Guenter Roeck
0 siblings, 1 reply; 3+ messages in thread
From: Lad Prabhakar @ 2021-12-16 18:36 UTC (permalink / raw)
To: Wim Van Sebroeck, Guenter Roeck, Krzysztof Kozlowski,
linux-watchdog, linux-arm-kernel, linux-samsung-soc
Cc: linux-kernel, Prabhakar, Rob Herring, Lad Prabhakar
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 bypassed the hierarchical setup and messed 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 <prabhakar.mahadev-lad.rj@bp.renesas.com>
---
drivers/watchdog/s3c2410_wdt.c | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/drivers/watchdog/s3c2410_wdt.c b/drivers/watchdog/s3c2410_wdt.c
index 2395f353e52d..f5aced344b7b 100644
--- a/drivers/watchdog/s3c2410_wdt.c
+++ b/drivers/watchdog/s3c2410_wdt.c
@@ -513,9 +513,9 @@ static int s3c2410wdt_probe(struct platform_device *pdev)
{
struct device *dev = &pdev->dev;
struct s3c2410_wdt *wdt;
- struct resource *wdt_irq;
unsigned int wtcon;
int started = 0;
+ int wdt_irq;
int ret;
wdt = devm_kzalloc(dev, sizeof(*wdt), GFP_KERNEL);
@@ -536,10 +536,9 @@ static int s3c2410wdt_probe(struct platform_device *pdev)
}
}
- wdt_irq = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
- if (wdt_irq == NULL) {
- dev_err(dev, "no irq resource specified\n");
- ret = -ENOENT;
+ wdt_irq = platform_get_irq(pdev, 0);
+ if (wdt_irq < 0) {
+ ret = wdt_irq;
goto err;
}
@@ -592,8 +591,8 @@ static int s3c2410wdt_probe(struct platform_device *pdev)
dev_info(dev, "default timer value is out of range, cannot start\n");
}
- ret = devm_request_irq(dev, wdt_irq->start, s3c2410wdt_irq, 0,
- pdev->name, pdev);
+ ret = devm_request_irq(dev, wdt_irq, s3c2410wdt_irq, 0,
+ pdev->name, pdev);
if (ret != 0) {
dev_err(dev, "failed to install irq (%d)\n", ret);
goto err_cpufreq;
--
2.17.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] watchdog: s3c2410: Use platform_get_irq() to get the interrupt
2021-12-16 18:36 [PATCH] watchdog: s3c2410: Use platform_get_irq() to get the interrupt Lad Prabhakar
@ 2021-12-16 19:01 ` Guenter Roeck
2021-12-16 21:42 ` Lad, Prabhakar
0 siblings, 1 reply; 3+ messages in thread
From: Guenter Roeck @ 2021-12-16 19:01 UTC (permalink / raw)
To: Lad Prabhakar, Wim Van Sebroeck, Krzysztof Kozlowski,
linux-watchdog, linux-arm-kernel, linux-samsung-soc
Cc: linux-kernel, Prabhakar, Rob Herring
On 12/16/21 10:36 AM, Lad Prabhakar wrote:
> 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 bypassed the hierarchical setup and messed 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 <prabhakar.mahadev-lad.rj@bp.renesas.com>
> ---
> drivers/watchdog/s3c2410_wdt.c | 13 ++++++-------
> 1 file changed, 6 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/watchdog/s3c2410_wdt.c b/drivers/watchdog/s3c2410_wdt.c
> index 2395f353e52d..f5aced344b7b 100644
> --- a/drivers/watchdog/s3c2410_wdt.c
> +++ b/drivers/watchdog/s3c2410_wdt.c
> @@ -513,9 +513,9 @@ static int s3c2410wdt_probe(struct platform_device *pdev)
> {
> struct device *dev = &pdev->dev;
> struct s3c2410_wdt *wdt;
> - struct resource *wdt_irq;
> unsigned int wtcon;
> int started = 0;
> + int wdt_irq;
> int ret;
>
> wdt = devm_kzalloc(dev, sizeof(*wdt), GFP_KERNEL);
> @@ -536,10 +536,9 @@ static int s3c2410wdt_probe(struct platform_device *pdev)
> }
> }
>
> - wdt_irq = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
> - if (wdt_irq == NULL) {
> - dev_err(dev, "no irq resource specified\n");
> - ret = -ENOENT;
> + wdt_irq = platform_get_irq(pdev, 0);
> + if (wdt_irq < 0) {
> + ret = wdt_irq;
> goto err;
All those "goto err;" statements in this function are pointless since they
just return ret. Since this is the first of those goto statements, please
replace it with "return wdt_irq;".
Thanks,
Guenter
> }
>
> @@ -592,8 +591,8 @@ static int s3c2410wdt_probe(struct platform_device *pdev)
> dev_info(dev, "default timer value is out of range, cannot start\n");
> }
>
> - ret = devm_request_irq(dev, wdt_irq->start, s3c2410wdt_irq, 0,
> - pdev->name, pdev);
> + ret = devm_request_irq(dev, wdt_irq, s3c2410wdt_irq, 0,
> + pdev->name, pdev);
> if (ret != 0) {
> dev_err(dev, "failed to install irq (%d)\n", ret);
> goto err_cpufreq;
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] watchdog: s3c2410: Use platform_get_irq() to get the interrupt
2021-12-16 19:01 ` Guenter Roeck
@ 2021-12-16 21:42 ` Lad, Prabhakar
0 siblings, 0 replies; 3+ messages in thread
From: Lad, Prabhakar @ 2021-12-16 21:42 UTC (permalink / raw)
To: Guenter Roeck
Cc: Lad Prabhakar, Wim Van Sebroeck, Krzysztof Kozlowski,
Linux Watchdog Mailing List, LAK, linux-samsung-soc, LKML,
Rob Herring
Hi Guenter,
Thank you for the review.
On Thu, Dec 16, 2021 at 7:01 PM Guenter Roeck <linux@roeck-us.net> wrote:
>
> On 12/16/21 10:36 AM, Lad Prabhakar wrote:
> > 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 bypassed the hierarchical setup and messed 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 <prabhakar.mahadev-lad.rj@bp.renesas.com>
> > ---
> > drivers/watchdog/s3c2410_wdt.c | 13 ++++++-------
> > 1 file changed, 6 insertions(+), 7 deletions(-)
> >
> > diff --git a/drivers/watchdog/s3c2410_wdt.c b/drivers/watchdog/s3c2410_wdt.c
> > index 2395f353e52d..f5aced344b7b 100644
> > --- a/drivers/watchdog/s3c2410_wdt.c
> > +++ b/drivers/watchdog/s3c2410_wdt.c
> > @@ -513,9 +513,9 @@ static int s3c2410wdt_probe(struct platform_device *pdev)
> > {
> > struct device *dev = &pdev->dev;
> > struct s3c2410_wdt *wdt;
> > - struct resource *wdt_irq;
> > unsigned int wtcon;
> > int started = 0;
> > + int wdt_irq;
> > int ret;
> >
> > wdt = devm_kzalloc(dev, sizeof(*wdt), GFP_KERNEL);
> > @@ -536,10 +536,9 @@ static int s3c2410wdt_probe(struct platform_device *pdev)
> > }
> > }
> >
> > - wdt_irq = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
> > - if (wdt_irq == NULL) {
> > - dev_err(dev, "no irq resource specified\n");
> > - ret = -ENOENT;
> > + wdt_irq = platform_get_irq(pdev, 0);
> > + if (wdt_irq < 0) {
> > + ret = wdt_irq;
> > goto err;
>
> All those "goto err;" statements in this function are pointless since they
> just return ret. Since this is the first of those goto statements, please
> replace it with "return wdt_irq;".
>
Sure will do and post a v2.
> Thanks,
> Guenter
>
> > }
> >
> > @@ -592,8 +591,8 @@ static int s3c2410wdt_probe(struct platform_device *pdev)
> > dev_info(dev, "default timer value is out of range, cannot start\n");
> > }
> >
> > - ret = devm_request_irq(dev, wdt_irq->start, s3c2410wdt_irq, 0,
> > - pdev->name, pdev);
> > + ret = devm_request_irq(dev, wdt_irq, s3c2410wdt_irq, 0,
> > + pdev->name, pdev);
> > if (ret != 0) {
> > dev_err(dev, "failed to install irq (%d)\n", ret);
> > goto err_cpufreq;
> >
>
Cheers,
Prabhakar
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-12-16 21:45 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-12-16 18:36 [PATCH] watchdog: s3c2410: Use platform_get_irq() to get the interrupt Lad Prabhakar
2021-12-16 19:01 ` Guenter Roeck
2021-12-16 21:42 ` Lad, Prabhakar
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).