From: Guenter Roeck <linux@roeck-us.net>
To: Russell King <rmk+kernel@armlinux.org.uk>,
Wim Van Sebroeck <wim@linux-watchdog.org>
Cc: linux-watchdog@vger.kernel.org
Subject: Re: [PATCH] watchdog: orion: fix platform_get_irq() complaints
Date: Fri, 29 Nov 2019 07:51:49 -0800 [thread overview]
Message-ID: <998b6a1b-7232-7f2e-2c63-48c5f74dab3e@roeck-us.net> (raw)
In-Reply-To: <E1iahcN-0000AT-Co@rmk-PC.armlinux.org.uk>
On 11/29/19 6:51 AM, Russell King wrote:
> Fix:
>
> orion_wdt f1020300.watchdog: IRQ index 1 not found
>
> which is caused by platform_get_irq() now complaining when optional
> IRQs are not found. Neither interrupt for orion is required, so
> make them both optional.
>
> Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
> ---
> drivers/watchdog/orion_wdt.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/watchdog/orion_wdt.c b/drivers/watchdog/orion_wdt.c
> index 1cccf8eb1c5d..8e6dfe76f9c9 100644
> --- a/drivers/watchdog/orion_wdt.c
> +++ b/drivers/watchdog/orion_wdt.c
> @@ -602,7 +602,7 @@ static int orion_wdt_probe(struct platform_device *pdev)
> set_bit(WDOG_HW_RUNNING, &dev->wdt.status);
>
> /* Request the IRQ only after the watchdog is disabled */
> - irq = platform_get_irq(pdev, 0);
> + irq = platform_get_irq_optional(pdev, 0);
> if (irq > 0) {
> /*
> * Not all supported platforms specify an interrupt for the
> @@ -617,7 +617,7 @@ static int orion_wdt_probe(struct platform_device *pdev)
> }
>
> /* Optional 2nd interrupt for pretimeout */
> - irq = platform_get_irq(pdev, 1);
> + irq = platform_get_irq_optional(pdev, 1);
> if (irq > 0) {
> orion_wdt_info.options |= WDIOF_PRETIMEOUT;
> ret = devm_request_irq(&pdev->dev, irq, orion_wdt_pre_irq,
>
prev parent reply other threads:[~2019-11-29 15:51 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-29 14:51 [PATCH] watchdog: orion: fix platform_get_irq() complaints Russell King
2019-11-29 14:56 ` Russell King - ARM Linux admin
2019-11-29 15:51 ` Guenter Roeck [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=998b6a1b-7232-7f2e-2c63-48c5f74dab3e@roeck-us.net \
--to=linux@roeck-us.net \
--cc=linux-watchdog@vger.kernel.org \
--cc=rmk+kernel@armlinux.org.uk \
--cc=wim@linux-watchdog.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).