From patchwork Wed Apr 26 03:12:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xingyu Wu X-Patchwork-Id: 87593 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp3811905vqo; Tue, 25 Apr 2023 20:16:32 -0700 (PDT) X-Google-Smtp-Source: AKy350Zh76X/08DMKwMWH2wuGDqVsyD6hwDpW2EwzennLlImvG2KbuWPysv3Sq/xuiz6J/cq0eVA X-Received: by 2002:a17:902:ef4d:b0:1a6:386f:39a3 with SMTP id e13-20020a170902ef4d00b001a6386f39a3mr24514360plx.31.1682478992542; Tue, 25 Apr 2023 20:16:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1682478992; cv=none; d=google.com; s=arc-20160816; b=jhfP3TNLYkrHBed1XZN27/oB+wrdU2fYPkPajD0QyfmvwROxQBMVZpY5VpQUSWdevK kAqPG6BTKhX3nYtnIEHoHeh6go//2aZ0RLR/fhijPbEEb0ReqTeyIESFjMsFo2GXIYsi CH+m+EuUbYRhBQpjL3WkJZsizEAYuU0fSPyKV2twbhiEd9B/r5UtlbSFjoxupO4ddpBc y1xGitjJu9eFa948YSUG+o8N/KCA5/EoXv+xpS70eix9z1uVjWfbpG4Ywl2GfXzxfe7F 8BGkH7Pf4BsiboaHb0KkaARX3VgZ2rOQimLfi817W1+XHVoSAew/aLNe3C5olL6H8P/p +k1g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=t2f719Z/stjXJ57BBgcdYYUl+gJhJeSiRXS1T/4/fDc=; b=V6zi8yEM88Fu1xnTUdiDJOUcGCgx69KJV2SKT515B23yFHvSy9pqwHegNgieRzC6Z+ 5hNs3yPC7WsNaVEZVE7WSAsEYMArOwLXiFmJHPHm5Y4/a5wm/1FNinxQa3YzLf2YgVKi 9Vz0mlhC0ZEAQl62LqfLI9243JV8C9oVcZHqKV5FIRNKbSNyC/ndtQkdBYLMp6tlT8zG HniXWZ7LfEPOPJLp+kj8l+HkrY6OkKaXL+4vKcpouKRwbaEGwN/IHp6/oreEGIBGqwBM CP6YBsQs9mGnfO/1W6yzZVRk0gaB1/2fFH6frWbTP6izWqY83NqdTecwEZAkb6BG7dEk dR9g== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id n13-20020a170902d2cd00b0019ab4f7b389si16264809plc.387.2023.04.25.20.16.12; Tue, 25 Apr 2023 20:16:32 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238464AbjDZDMZ convert rfc822-to-8bit (ORCPT + 99 others); Tue, 25 Apr 2023 23:12:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43468 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233352AbjDZDMY (ORCPT ); Tue, 25 Apr 2023 23:12:24 -0400 Received: from fd01.gateway.ufhost.com (fd01.gateway.ufhost.com [61.152.239.71]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F0C81210A; Tue, 25 Apr 2023 20:12:19 -0700 (PDT) Received: from EXMBX165.cuchost.com (unknown [175.102.18.54]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "EXMBX165", Issuer "EXMBX165" (not verified)) by fd01.gateway.ufhost.com (Postfix) with ESMTP id 7C68D24DB83; Wed, 26 Apr 2023 11:12:17 +0800 (CST) Received: from EXMBX061.cuchost.com (172.16.6.61) by EXMBX165.cuchost.com (172.16.6.75) with Microsoft SMTP Server (TLS) id 15.0.1497.42; Wed, 26 Apr 2023 11:12:17 +0800 Received: from localhost.localdomain (113.72.145.137) by EXMBX061.cuchost.com (172.16.6.61) with Microsoft SMTP Server (TLS) id 15.0.1497.42; Wed, 26 Apr 2023 11:12:16 +0800 From: Xingyu Wu To: , Wim Van Sebroeck , Guenter Roeck CC: Xingyu Wu , Samin Guo , Subject: [PATCH v2] watchdog: starfive: Fix the probe return error if PM and early_enable are both disabled Date: Wed, 26 Apr 2023 11:12:16 +0800 Message-ID: <20230426031216.37981-1-xingyu.wu@starfivetech.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-Originating-IP: [113.72.145.137] X-ClientProxiedBy: EXCAS064.cuchost.com (172.16.6.24) To EXMBX061.cuchost.com (172.16.6.61) X-YovoleRuleAgent: yovoleflag X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,RCVD_IN_MSPIKE_H2, SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1764142353402256179?= X-GMAIL-MSGID: =?utf-8?q?1764207092289226925?= When the starfive watchdog driver uses 'pm_runtime_put_sync()' as probe return value at last and 'early_enable' is disabled, it could return the error '-ENOSYS' if the CONFIG_PM is disabled, but the driver should works normally. Drop the 'return' and keep the 'pm_runtime_put_sync()', but do not use it as the return value. Fixes: db728ea9c7be ("drivers: watchdog: Add StarFive Watchdog driver") Signed-off-by: Xingyu Wu Reviewed-by: Guenter Roeck --- Hi, Guenter and Wim, This patch fixes the issue of StarFive watchdog driver and rebases on the master branch of linux-next. Thanks. Changes since v1: - Dropped the check of PM and used the 'pm_runtime_put_sync()' directly. v1: https://lore.kernel.org/all/20230425100456.32718-1-xingyu.wu@starfivetech.com/ --- drivers/watchdog/starfive-wdt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/watchdog/starfive-wdt.c b/drivers/watchdog/starfive-wdt.c index 1995cceca51e..8f378900624d 100644 --- a/drivers/watchdog/starfive-wdt.c +++ b/drivers/watchdog/starfive-wdt.c @@ -492,7 +492,7 @@ static int starfive_wdt_probe(struct platform_device *pdev) goto err_exit; if (!early_enable) - return pm_runtime_put_sync(&pdev->dev); + pm_runtime_put_sync(&pdev->dev); return 0;