From patchwork Tue Nov 29 19:19:41 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Cercueil X-Patchwork-Id: 13059055 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id CE024C433FE for ; Tue, 29 Nov 2022 19:21:45 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 6234A10E336; Tue, 29 Nov 2022 19:21:43 +0000 (UTC) Received: from aposti.net (aposti.net [89.234.176.197]) by gabe.freedesktop.org (Postfix) with ESMTPS id 6795010E334 for ; Tue, 29 Nov 2022 19:21:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=crapouillou.net; s=mail; t=1669749652; 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=O43i3nkhiM8UDAwLE+AJBroZL1tTLrgWyp7LlLtcdyI=; b=wGPcwUhBuziP698+TBgygiBftwCunol6LK9gZC/PAVcuEWZgVn+gjoqIHmG966WJJGKmJj F2YEMh4vwP8gzqR3tw7aMD0OmOS0u2vg5AtmWfaKVTJ1S89f2YEzay7v1pPaPWgAVAwuey KC/7UqXGrEQSt52exEgL4yS2hmd5y7s= From: Paul Cercueil To: David Airlie , Daniel Vetter Subject: [PATCH v2 25/26] drm: tidss: Remove #ifdef guards for PM related functions Date: Tue, 29 Nov 2022 19:19:41 +0000 Message-Id: <20221129191942.138244-12-paul@crapouillou.net> In-Reply-To: <20221129191942.138244-1-paul@crapouillou.net> References: <20221129191733.137897-1-paul@crapouillou.net> <20221129191942.138244-1-paul@crapouillou.net> MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paul Cercueil , Tomi Valkeinen , Jyri Sarha , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" 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 07d94b1e8089..3f0217256948 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 */