From patchwork Mon Nov 7 17:55:09 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Cercueil X-Patchwork-Id: 16621 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp2206505wru; Mon, 7 Nov 2022 10:05:18 -0800 (PST) X-Google-Smtp-Source: AMsMyM5neBfGKNrE/qSApiLog1jITnYwYcEh+6uF/FCTfiHymmFUjtHTMCn0xC32izqsYTgs91eK X-Received: by 2002:a17:907:a087:b0:7ae:44d7:2db8 with SMTP id hu7-20020a170907a08700b007ae44d72db8mr13649927ejc.356.1667844318338; Mon, 07 Nov 2022 10:05:18 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1667844318; cv=none; d=google.com; s=arc-20160816; b=xqdg4x2wkaztaY92XmY/squk9bPLoS/dn9vvMzNf/nZf2PLkmxrceKiqEbPpjkpxMD 2oFV2luAmhz+92mHEO+4FoKWzC4jsUba7yryjDX6vdwpQWF4C+wKUS7TQxPhgzo4j6F3 Temaj0uXjvsMzXQp8pptj7G+L1jL3HDi65RRZY1DlW1GLVxfObRjm4jDns6APd1uijAC tW8fJBoNevoGcbes/P9ZhH+vBlmwa6bnnJUCOpCiODFxFYq+Zqqi/5Q1cI1W2hseStZy 86YfTUs/Sv2GVS34tWwQiRREHCxWIdOjlDSC/BuBtLRFH6tV4N+S4RQkC3ax6TUn+gqO wwtA== 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=M43DylMDkl+szcXiL4W9UuJ9KmYsm/BsQcv0v6WVc2s=; b=Wmou7XkeQR/enFsSEzqVdvtbk+F6xYOHx+sJAne2sHbDVvjMr4IiMf3Mq6egR85nbf FcxHPstQ60/Sr+Mv0+hteDPt8jhKTVhWjj4JVAqHLxQLIoaKOD/+izG180MKEoBKkNcw 5FJBs+rSES2Rp3t2DeSJx6Q1xkmNEzf+3rmE05LzcL3fBR08yTS6kql+VtbObInVWQ1c 5WsiY5B+LmbSqZ8Hd7POz9HmLKYcVTvFcLeFOPUakkhPna7rjzlVXF002Rhi5YsFDri1 aX91WvLQpc3iqTMWDYS33HhbrrgUkxg+InaghaDaIw1ri4NdlCpfQni8UtitPec9IGxE 9joA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@crapouillou.net header.s=mail header.b=gTIgV9Yr; 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 s19-20020a508d13000000b00461b5ba990dsi10096130eds.78.2022.11.07.10.04.53; Mon, 07 Nov 2022 10:05:18 -0800 (PST) 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=gTIgV9Yr; 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 S233027AbiKGR6b (ORCPT + 99 others); Mon, 7 Nov 2022 12:58:31 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39798 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232105AbiKGR6N (ORCPT ); Mon, 7 Nov 2022 12:58:13 -0500 Received: from aposti.net (aposti.net [89.234.176.197]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6DD85286E3 for ; Mon, 7 Nov 2022 09:55:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=crapouillou.net; s=mail; t=1667843719; 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=M43DylMDkl+szcXiL4W9UuJ9KmYsm/BsQcv0v6WVc2s=; b=gTIgV9YrTwg5pvDdLqvG6YRsDsAreiXemU7vjadC9DexHxpNqbgNzrw3knRBsW7zuc7m6u 95ifxjlYX000twB6DJSj4xrFHyGv8dAZN/cWwcUD2XM5ZLEEMUZ+On80sMT6zhW5is3/12 JTpfOkAQoR6aZkcH5y97CvLVYXtWy9g= From: Paul Cercueil To: Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Daniel Vetter Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Paul Cercueil , Jyri Sarha , Tomi Valkeinen Subject: [PATCH 25/26] drm: tidss: Remove #ifdef guards for PM related functions Date: Mon, 7 Nov 2022 17:55:09 +0000 Message-Id: <20221107175510.361051-2-paul@crapouillou.net> In-Reply-To: <20221107175510.361051-1-paul@crapouillou.net> References: <20221107175106.360578-1-paul@crapouillou.net> <20221107175510.361051-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 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?1748861523984979621?= X-GMAIL-MSGID: =?utf-8?q?1748861523984979621?= Use the SYSTEM_SLEEP_PM_OPS() and RUNTIME_PM_OPS() macros to handle the PM callbacks. These macros allow the suspend and resume functions to be automatically dropped by the compiler when CONFIG_PM is 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. It also allows to drop the __maybe_unused tags. Some #ifndef CONFIG_PM guards were protecting simple statements, and were also converted to "if (!IS_ENABLED(CONFIG_PM))". Signed-off-by: Paul Cercueil --- Cc: Jyri Sarha Cc: Tomi Valkeinen --- drivers/gpu/drm/tidss/tidss_drv.c | 29 +++++++++++++---------------- 1 file changed, 13 insertions(+), 16 deletions(-) diff --git a/drivers/gpu/drm/tidss/tidss_drv.c b/drivers/gpu/drm/tidss/tidss_drv.c index 15cd9b91b7e2..6957c86f9e85 100644 --- a/drivers/gpu/drm/tidss/tidss_drv.c +++ b/drivers/gpu/drm/tidss/tidss_drv.c @@ -48,7 +48,7 @@ void tidss_runtime_put(struct tidss_device *tidss) WARN_ON(r < 0); } -static int __maybe_unused tidss_pm_runtime_suspend(struct device *dev) +static int tidss_pm_runtime_suspend(struct device *dev) { struct tidss_device *tidss = dev_get_drvdata(dev); @@ -57,7 +57,7 @@ static int __maybe_unused tidss_pm_runtime_suspend(struct device *dev) return dispc_runtime_suspend(tidss->dispc); } -static int __maybe_unused tidss_pm_runtime_resume(struct device *dev) +static int tidss_pm_runtime_resume(struct device *dev) { struct tidss_device *tidss = dev_get_drvdata(dev); int r; @@ -71,7 +71,7 @@ static int __maybe_unused tidss_pm_runtime_resume(struct device *dev) return 0; } -static int __maybe_unused tidss_suspend(struct device *dev) +static int tidss_suspend(struct device *dev) { struct tidss_device *tidss = dev_get_drvdata(dev); @@ -80,7 +80,7 @@ static int __maybe_unused tidss_suspend(struct device *dev) return drm_mode_config_helper_suspend(&tidss->ddev); } -static int __maybe_unused tidss_resume(struct device *dev) +static int tidss_resume(struct device *dev) { struct tidss_device *tidss = dev_get_drvdata(dev); @@ -89,9 +89,9 @@ static int __maybe_unused tidss_resume(struct device *dev) return drm_mode_config_helper_resume(&tidss->ddev); } -static __maybe_unused const struct dev_pm_ops tidss_pm_ops = { - SET_SYSTEM_SLEEP_PM_OPS(tidss_suspend, tidss_resume) - SET_RUNTIME_PM_OPS(tidss_pm_runtime_suspend, tidss_pm_runtime_resume, NULL) +static const struct dev_pm_ops tidss_pm_ops = { + SYSTEM_SLEEP_PM_OPS(tidss_suspend, tidss_resume) + RUNTIME_PM_OPS(tidss_pm_runtime_suspend, tidss_pm_runtime_resume, NULL) }; /* DRM device Information */ @@ -145,10 +145,9 @@ static int tidss_probe(struct platform_device *pdev) pm_runtime_enable(dev); -#ifndef CONFIG_PM /* If we don't have PM, we need to call resume manually */ - dispc_runtime_resume(tidss->dispc); -#endif + if (!IS_ENABLED(CONFIG_PM)) + dispc_runtime_resume(tidss->dispc); ret = tidss_modeset_init(tidss); if (ret < 0) { @@ -190,9 +189,8 @@ static int tidss_probe(struct platform_device *pdev) tidss_irq_uninstall(ddev); err_runtime_suspend: -#ifndef CONFIG_PM - dispc_runtime_suspend(tidss->dispc); -#endif + if (!IS_ENABLED(CONFIG_PM)) + dispc_runtime_suspend(tidss->dispc); pm_runtime_disable(dev); return ret; @@ -212,10 +210,9 @@ static int tidss_remove(struct platform_device *pdev) tidss_irq_uninstall(ddev); -#ifndef CONFIG_PM /* If we don't have PM, we need to call suspend manually */ - dispc_runtime_suspend(tidss->dispc); -#endif + if (!IS_ENABLED(CONFIG_PM)) + dispc_runtime_suspend(tidss->dispc); pm_runtime_disable(dev); /* devm allocated dispc goes away with the dev so mark it NULL */