From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8E244C2BA83 for ; Fri, 14 Feb 2020 16:04:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5BAB32467D for ; Fri, 14 Feb 2020 16:04:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1581696242; bh=UqdYGeT1iRgYAILlaBy3iyBXTZws2wXAzGt+0B3DafM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=ItPA8VomCUV1vhBcEOybv5a7W0AAwMUac1d5qL4cmgkvkrsGXWSA25j4LhhvWFFVE nHp5xGVHFzrcI34tuf0+ZhssOYRbLNVPf7lYn7oKuCTr2MNMcMmttM+jfCbS9sLuXU VBdgRkG1U5tfSKxkzpGM1Ro6r9zyqRRtrOw6HTFo= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389825AbgBNQEB (ORCPT ); Fri, 14 Feb 2020 11:04:01 -0500 Received: from mail.kernel.org ([198.145.29.99]:51714 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389820AbgBNQEA (ORCPT ); Fri, 14 Feb 2020 11:04:00 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 604BE2467E; Fri, 14 Feb 2020 16:03:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1581696239; bh=UqdYGeT1iRgYAILlaBy3iyBXTZws2wXAzGt+0B3DafM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=msYQvqSAy9Dgc5udRrI4Fbews6NMnhHE1SSDtUSDXVwMSeRCBoqkp8taO0uBnQy2e 7UX1SrwOXkOKzjE4mhHRpNLw6MZ4Y3h5E/3aq0T/Mh5aBSrFP8Cg4tOhG/A1gBVJlf KO5VrcL1ediftIvnUj+RosP3FvITWxq8hxZHjHZc= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Sai Prakash Ranjan , Bjorn Andersson , Guenter Roeck , Stephen Boyd , Wim Van Sebroeck , Sasha Levin , linux-arm-msm@vger.kernel.org, linux-watchdog@vger.kernel.org Subject: [PATCH AUTOSEL 5.4 098/459] watchdog: qcom: Use platform_get_irq_optional() for bark irq Date: Fri, 14 Feb 2020 10:55:48 -0500 Message-Id: <20200214160149.11681-98-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200214160149.11681-1-sashal@kernel.org> References: <20200214160149.11681-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-watchdog-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-watchdog@vger.kernel.org From: Sai Prakash Ranjan [ Upstream commit e0b4f4e0cf7fa9d62628d4249c765ec18dffd143 ] platform_get_irq() prints an error message when the interrupt is not available. So on platforms where bark interrupt is not specified, following error message is observed on SDM845. [ 2.975888] qcom_wdt 17980000.watchdog: IRQ index 0 not found This is also seen on SC7180, SM8150 SoCs as well. Fix this by using platform_get_irq_optional() instead. Fixes: 36375491a4395654 ("watchdog: qcom: support pre-timeout when the bark irq is available") Signed-off-by: Sai Prakash Ranjan Reviewed-by: Bjorn Andersson Reviewed-by: Guenter Roeck Reviewed-by: Stephen Boyd Link: https://lore.kernel.org/r/20191213064934.4112-1-saiprakash.ranjan@codeaurora.org Signed-off-by: Guenter Roeck Signed-off-by: Wim Van Sebroeck Signed-off-by: Sasha Levin --- drivers/watchdog/qcom-wdt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/watchdog/qcom-wdt.c b/drivers/watchdog/qcom-wdt.c index a494543d3ae1b..eb47fe5ed2805 100644 --- a/drivers/watchdog/qcom-wdt.c +++ b/drivers/watchdog/qcom-wdt.c @@ -246,7 +246,7 @@ static int qcom_wdt_probe(struct platform_device *pdev) } /* check if there is pretimeout support */ - irq = platform_get_irq(pdev, 0); + irq = platform_get_irq_optional(pdev, 0); if (irq > 0) { ret = devm_request_irq(dev, irq, qcom_wdt_isr, IRQF_TRIGGER_RISING, -- 2.20.1