From patchwork Thu Oct 20 18:50:44 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Cercueil X-Patchwork-Id: 6359 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4242:0:0:0:0:0 with SMTP id s2csp278644wrr; Thu, 20 Oct 2022 12:09:32 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5zp9pIK9fTzeuWMn5RcSjga+vD9lMfxdn6NIqg0qP10W+pqmqr/1cMZdyxCqzvLJRl0BJ9 X-Received: by 2002:aa7:d415:0:b0:459:4c7:60ce with SMTP id z21-20020aa7d415000000b0045904c760cemr13637570edq.202.1666292971896; Thu, 20 Oct 2022 12:09:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666292971; cv=none; d=google.com; s=arc-20160816; b=oXc46ATGeEtoSAG5G7Vng/zyI3Tvpz2g5NSk9+CZEfQPzVvshylYCtFOj3+QgM1uuI Fay2070sUvvEoLxWmzpIJI8anrNIT87BKFIZgDHG5CxqMkViAIrTXzQw0lyXvlbbc0aG rRG0V/Ms6qy/UxMPU2DLLqHc9bptdKpd7LW5PCYMM/6RQCMN/TtVWs2eXczBq2Jt0vbc R6uTY/VmuOOkz0fvqPHeCAbjFdW3SZg+kOY0HMCSgBIW/8+nw5E5bLBxu5IS8oHLcM7o hKihM6m5UoTz0Psp4ZTYfLUvm4noMUdYPsRcu2aNyuL8n6rmlRSWGS8IuxUZ/eOmDukq fu/Q== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=T5IpqpesPwT77Jvi5jmQo30Q/fMNFWN8hFsyxEzy+wU=; b=jh2WwQbL7HduL10OeOfEXkeBRFAYQZDqFpZ8x9dUJ+WWrGIi7SpHr9CB0aMLYC4zG/ ThIGnmhoemc/KYTMYgfnc/ewDkNhI9qkutJLSVnD/OdEDXsarPm9Tiks3/G2+9jcbsP+ 2fY1sCEdKH94t4cjXaj0QHY11GG/nN2zRNhgGbUQq/d94/+wNRZQW3yt00bUBiG/i1FU rKLBX0GJ+BBvjLdFzczqWYMTCbrfIJfx8KkU6A8KXgrUIAuYdZ1GGjHTbUpwHLo/tzI+ HQ641xIXekg1v8HpuymWWLH9Co8byqum84cR1fm89IHd2HI3rLuz/eKuR6Yu8OSgkawH 2l3g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@crapouillou.net header.s=mail header.b=RV8v8Mco; 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 n7-20020a509347000000b0045440929f87si3087323eda.86.2022.10.20.12.09.06; Thu, 20 Oct 2022 12:09:31 -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=RV8v8Mco; 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 S230126AbiJTSvL (ORCPT + 99 others); Thu, 20 Oct 2022 14:51:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54884 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230125AbiJTSvH (ORCPT ); Thu, 20 Oct 2022 14:51:07 -0400 Received: from aposti.net (aposti.net [89.234.176.197]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id ABECD156256; Thu, 20 Oct 2022 11:51:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=crapouillou.net; s=mail; t=1666291854; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=T5IpqpesPwT77Jvi5jmQo30Q/fMNFWN8hFsyxEzy+wU=; b=RV8v8McoZWApg9qmSCRUuGTBvS8MtaVJr25IDyp3vXfG0El7CofrN8G8SqO6nLop+B3omY s6oXK5yHJQ1KWBSqpRZh5GmagNBCB8kV9r8TayjZWGG5bmdTIRZ1In7RZO/f3Rey9HIZGT gnUN08FlnCXn3fWoJIz30relP/B7l7M= From: Paul Cercueil To: Wim Van Sebroeck , Guenter Roeck Cc: linux-watchdog@vger.kernel.org, linux-kernel@vger.kernel.org, Paul Cercueil , Nicolas Ferre , Alexandre Belloni , Claudiu Beznea , linux-arm-kernel@lists.infradead.org Subject: [PATCH 1/4] watchdog: at91rm9200: Remove #ifdef guards for PM related functions Date: Thu, 20 Oct 2022 19:50:44 +0100 Message-Id: <20221020185047.1001522-2-paul@crapouillou.net> In-Reply-To: <20221020185047.1001522-1-paul@crapouillou.net> References: <20221020185047.1001522-1-paul@crapouillou.net> MIME-Version: 1.0 X-Spam: Yes 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, URIBL_BLOCKED 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?1747234818976924867?= X-GMAIL-MSGID: =?utf-8?q?1747234818976924867?= Use the pm_ptr() macro to handle the .suspend/.resume callbacks. This macro allows the suspend and resume functions to be automatically dropped by the compiler when CONFIG_SUSPEND is disabled, without having to use #ifdef guards. Not using #ifdef guards means that the code is always compiled independently of any Kconfig option, and thanks to that bugs and regressions are easier to catch. Signed-off-by: Paul Cercueil Reviewed-by: Guenter Roeck Reviewed-by: Claudiu Beznea --- Cc: Nicolas Ferre Cc: Alexandre Belloni Cc: Claudiu Beznea Cc: linux-arm-kernel@lists.infradead.org drivers/watchdog/at91rm9200_wdt.c | 11 ++--------- drivers/watchdog/db8500_wdt.c | 9 ++------- 2 files changed, 4 insertions(+), 16 deletions(-) diff --git a/drivers/watchdog/at91rm9200_wdt.c b/drivers/watchdog/at91rm9200_wdt.c index 6d751eb8191d..5126454bb861 100644 --- a/drivers/watchdog/at91rm9200_wdt.c +++ b/drivers/watchdog/at91rm9200_wdt.c @@ -278,8 +278,6 @@ static void at91wdt_shutdown(struct platform_device *pdev) at91_wdt_stop(); } -#ifdef CONFIG_PM - static int at91wdt_suspend(struct platform_device *pdev, pm_message_t message) { at91_wdt_stop(); @@ -293,11 +291,6 @@ static int at91wdt_resume(struct platform_device *pdev) return 0; } -#else -#define at91wdt_suspend NULL -#define at91wdt_resume NULL -#endif - static const struct of_device_id at91_wdt_dt_ids[] = { { .compatible = "atmel,at91rm9200-wdt" }, { /* sentinel */ } @@ -308,8 +301,8 @@ static struct platform_driver at91wdt_driver = { .probe = at91wdt_probe, .remove = at91wdt_remove, .shutdown = at91wdt_shutdown, - .suspend = at91wdt_suspend, - .resume = at91wdt_resume, + .suspend = pm_ptr(at91wdt_suspend), + .resume = pm_ptr(at91wdt_resume), .driver = { .name = "atmel_st_watchdog", .of_match_table = at91_wdt_dt_ids, diff --git a/drivers/watchdog/db8500_wdt.c b/drivers/watchdog/db8500_wdt.c index 6ed8b63d310d..97148ac0aa54 100644 --- a/drivers/watchdog/db8500_wdt.c +++ b/drivers/watchdog/db8500_wdt.c @@ -105,7 +105,6 @@ static int db8500_wdt_probe(struct platform_device *pdev) return 0; } -#ifdef CONFIG_PM static int db8500_wdt_suspend(struct platform_device *pdev, pm_message_t state) { @@ -130,15 +129,11 @@ static int db8500_wdt_resume(struct platform_device *pdev) } return 0; } -#else -#define db8500_wdt_suspend NULL -#define db8500_wdt_resume NULL -#endif static struct platform_driver db8500_wdt_driver = { .probe = db8500_wdt_probe, - .suspend = db8500_wdt_suspend, - .resume = db8500_wdt_resume, + .suspend = pm_ptr(db8500_wdt_suspend), + .resume = pm_ptr(db8500_wdt_resume), .driver = { .name = "db8500_wdt", },