From patchwork Thu Jul 6 08:29:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Cercueil X-Patchwork-Id: 116567 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f45:0:b0:3ea:f831:8777 with SMTP id v5csp2408620vqx; Thu, 6 Jul 2023 01:50:07 -0700 (PDT) X-Google-Smtp-Source: APBJJlHn/B8QneX6JZBeRGnS92+sWYLcnZGjSEGK1+0SqkDUUT3lXTM3ZYae9hPEP+WXu6liGTD6 X-Received: by 2002:a05:6a00:39a9:b0:667:e17e:85b7 with SMTP id fi41-20020a056a0039a900b00667e17e85b7mr1470490pfb.1.1688633406817; Thu, 06 Jul 2023 01:50:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688633406; cv=none; d=google.com; s=arc-20160816; b=ps1tpIEFrW8KcFmjA+DJ7lf5Lu14hFeGvacMMPR3+DOdsYv0QVGIw4IyCb0tPP8/lN DZNTMak2Y5xDSv+1F+C28VKxrb5fgtHTV3VlVaDSVT7U0XD17mYrusIC08xyHHlE7LAj Vm12OZc5NDTqdSf2z7BD84sPlnQxunfKsguVPFCIO0Qfemb0wfoNaTeioEcdPf0o+6Q4 f6TWTnZ3sqRUMbgr5Lkl3+cpBr2cN+l6Crz/BEHYH+5lEedx18MYy6t1QM0QL+Vz/GS5 0cpKw7hxEW+KK9EkYcnPxHyp9YJyPYM07o1eI8Kgy2npW/AB8m+RFhPSfOyOUbAZPoWh 2C4Q== 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:dkim-signature; bh=C5ZsjOqtPPGYJFIxPY4zElOVIK+rkHUv8ea5aIS7+R8=; fh=7s3laOj/RtmfEjG5StkWXEy0nrr7IxegdHSCZ7G2tJI=; b=j0nXkmaWLohF0zVbWVSP/Y36GchDn95Kb1Pbjof6nkrVS1oTgOQs1RTkXH8VlcZoYj ooSPH5i7hK3h/mKZEMK0D/M7rMzHmz47yJwWCYh13Z3ZAZQUektxVx4ZivgFIVPomCqu w/sI8+G3l7BxW4rUrh5Y0lX9/uA74phgAvYoF51V405tUm6PZoX2vzsc/HheQP6laVmJ l+OyrGFc9fX348jD1KPN/Paw9RcH9IEiUHFmVuucC/2toK1zSxx9CvAxnfubn6Jxiv34 XCQg8L9S3cEK7klyXIxo790Whi7G0orJ96IV6+JMQrWfgfJQdNDSGIN7AyWZeg1Hx9vk loqg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@crapouillou.net header.s=mail header.b=JKl+j3vK; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=crapouillou.net Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id o12-20020a056a0015cc00b0067d2eeacacesi1035956pfu.355.2023.07.06.01.49.53; Thu, 06 Jul 2023 01:50:06 -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; dkim=pass header.i=@crapouillou.net header.s=mail header.b=JKl+j3vK; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=crapouillou.net Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229957AbjGFI3k (ORCPT + 99 others); Thu, 6 Jul 2023 04:29:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46668 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229524AbjGFI3j (ORCPT ); Thu, 6 Jul 2023 04:29:39 -0400 Received: from aposti.net (aposti.net [89.234.176.197]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0A048172B; Thu, 6 Jul 2023 01:29:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=crapouillou.net; s=mail; t=1688632175; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=C5ZsjOqtPPGYJFIxPY4zElOVIK+rkHUv8ea5aIS7+R8=; b=JKl+j3vKNg/eW7Ik2efJYb5lOny2bzPXKHYPEG/5xYgAXHtv83U9yljp/qy68vtp6glsPD LVa0jH4/k1CT7YM1O+k6sDFMKGmZvfPnRi75TvMXhvl69gaOf0mfM2dB+mh0W/ef6iWTZ1 M0HsxfUVhFSsydQbE6AMQnTVF4T7aFo= From: Paul Cercueil To: Xingyu Wu , Samin Guo , Wim Van Sebroeck , Guenter Roeck Cc: linux-watchdog@vger.kernel.org, linux-kernel@vger.kernel.org, Paul Cercueil Subject: [PATCH] watchdog: starfive: Remove #ifdef guards for PM related functions Date: Thu, 6 Jul 2023 10:29:28 +0200 Message-Id: <20230706082928.10869-1-paul@crapouillou.net> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,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?1770660463050029699?= X-GMAIL-MSGID: =?utf-8?q?1770660463050029699?= Use the new PM macros for the suspend and resume functions to be automatically dropped by the compiler when CONFIG_PM or CONFIG_PM_SLEEP are disabled, without having to use #ifdef guards. This has the advantage of always compiling these functions in, independently of any Kconfig option. Thanks to that, bugs and other regressions are subsequently easier to catch. Signed-off-by: Paul Cercueil Reviewed-by: Guenter Roeck --- drivers/watchdog/starfive-wdt.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/drivers/watchdog/starfive-wdt.c b/drivers/watchdog/starfive-wdt.c index 8058fca4d05d..7c8a1c5e75be 100644 --- a/drivers/watchdog/starfive-wdt.c +++ b/drivers/watchdog/starfive-wdt.c @@ -526,7 +526,6 @@ static void starfive_wdt_shutdown(struct platform_device *pdev) starfive_wdt_pm_stop(&wdt->wdd); } -#ifdef CONFIG_PM_SLEEP static int starfive_wdt_suspend(struct device *dev) { struct starfive_wdt *wdt = dev_get_drvdata(dev); @@ -556,9 +555,7 @@ static int starfive_wdt_resume(struct device *dev) return starfive_wdt_start(wdt); } -#endif /* CONFIG_PM_SLEEP */ -#ifdef CONFIG_PM static int starfive_wdt_runtime_suspend(struct device *dev) { struct starfive_wdt *wdt = dev_get_drvdata(dev); @@ -574,11 +571,10 @@ static int starfive_wdt_runtime_resume(struct device *dev) return starfive_wdt_enable_clock(wdt); } -#endif /* CONFIG_PM */ static const struct dev_pm_ops starfive_wdt_pm_ops = { - SET_RUNTIME_PM_OPS(starfive_wdt_runtime_suspend, starfive_wdt_runtime_resume, NULL) - SET_SYSTEM_SLEEP_PM_OPS(starfive_wdt_suspend, starfive_wdt_resume) + RUNTIME_PM_OPS(starfive_wdt_runtime_suspend, starfive_wdt_runtime_resume, NULL) + SYSTEM_SLEEP_PM_OPS(starfive_wdt_suspend, starfive_wdt_resume) }; static const struct of_device_id starfive_wdt_match[] = { @@ -594,7 +590,7 @@ static struct platform_driver starfive_wdt_driver = { .shutdown = starfive_wdt_shutdown, .driver = { .name = "starfive-wdt", - .pm = &starfive_wdt_pm_ops, + .pm = pm_ptr(&starfive_wdt_pm_ops), .of_match_table = starfive_wdt_match, }, };