Received: by 2002:a05:6358:d09b:b0:dc:cd0c:909e with SMTP id jc27csp1348472rwb; Tue, 29 Nov 2022 12:17:11 -0800 (PST) X-Google-Smtp-Source: AA0mqf4oqYw2/QUu5gj3y5vTPE/ZKRm6/DmL6bts0lsJRR7ocGA6zGwz9RzwIOLV3Eb1QEzTIvN4 X-Received: by 2002:a50:ff0d:0:b0:461:c6e8:452e with SMTP id a13-20020a50ff0d000000b00461c6e8452emr42995878edu.298.1669753031230; Tue, 29 Nov 2022 12:17:11 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669753031; cv=none; d=google.com; s=arc-20160816; b=UrQofSYpm5RPNAC+jLtAOZu6pZJGnrh5gVjn4ylgFtGPWqeK9XmbegDSmbk4Zi1pBU aJN1dpwL7uFG/tvI3hhGS+FeHMavMN3Gn9nYKOnjAS4pNvdBB2xRVhJot3Wp82zHr8sH 0zfLdJXQ6H+5wKECzKDtnNGCz1XC7LGCOgdtK4rdeITU6IcAExYIKWPkFffQYMiSZomF NvkWUuIZbP01C5vqRKTZUZxRnxxNk3833ZB10QbOKX6BrRSycjgmLVFxRDUQgUD+0HZZ uJZpM6aA4xhYiOHdHWnm+3HkyVtAA8njbBG3TYb2wW3SgHGmCEGRqm7hv/P5cgswFDc9 rQbA== 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=GXp3V8OWFSqCNWUIleivToEKqZcIGzXiTpP98hO8E8c=; b=kfl2ysr/gFjuMbgBJ/2Fz9IdyBoDIPAXiVaRpf8OZxeaiFqSFZ6W0ndLOWr7H062be W82BI9u9YYdyM4zRY0NBAM+nX8mIljU6VdmP59sjWEihu8EN4klTHXlFKa/bdng0qVUS /MLxgLk+Wd9gxedKdFPVz5in16SQNKfl5tH52cY2hyoZlI3/jkrjANPkx9aJ1cMgE0zJ 2wszVPkDP0DM/RVNdNSJKzt1laIfyYtdJWMrpixMYvizBtttXoYLSMXoeGqpR6Wr51OL gR/v/Cgx3J2Gp9jVRgF29vAszBl9SHIBKhhgMadJiYgHKZukUwz7xMY+pTJfeD/k28X8 5a9Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@crapouillou.net header.s=mail header.b=EeGei6Ln; 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 Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id g17-20020a1709065d1100b007c08e3b0e0fsi1652092ejt.242.2022.11.29.12.16.51; Tue, 29 Nov 2022 12:17:11 -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=EeGei6Ln; 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 S236710AbiK2TUw (ORCPT + 84 others); Tue, 29 Nov 2022 14:20:52 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57258 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236779AbiK2TUA (ORCPT ); Tue, 29 Nov 2022 14:20:00 -0500 Received: from aposti.net (aposti.net [89.234.176.197]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2684A6A757 for ; Tue, 29 Nov 2022 11:19:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=crapouillou.net; s=mail; t=1669749486; 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=GXp3V8OWFSqCNWUIleivToEKqZcIGzXiTpP98hO8E8c=; b=EeGei6LnJKO6mGWa8RpkBRQ03VjBEPFJ8KX5roLt5+FwPmqMgbiRHeDmknPTUtKfE0R4Gn atNTFJtzdna062bv1oyeN8nvEIQ8j8DBbwvBNcz0qrridF8rCq1fMWx49oJxr5vmZF4HXk GKoE0/QZRxvzqzIr8VpmvJQPvJnklB4= From: Paul Cercueil To: David Airlie , Daniel Vetter Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Paul Cercueil , Lucas Stach , Russell King , Christian Gmeiner , etnaviv@lists.freedesktop.org Subject: [PATCH v2 12/26] drm: etnaviv: Remove #ifdef guards for PM related functions Date: Tue, 29 Nov 2022 19:17:19 +0000 Message-Id: <20221129191733.137897-13-paul@crapouillou.net> In-Reply-To: <20221129191733.137897-1-paul@crapouillou.net> References: <20221129191733.137897-1-paul@crapouillou.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 Use the RUNTIME_PM_OPS() and pm_ptr() macros to handle the .runtime_suspend/.runtime_resume 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. Some #ifdef CONFIG_PM guards were protecting simple statements, and were also converted to "if (IS_ENABLED(CONFIG_PM))". Signed-off-by: Paul Cercueil --- Cc: Lucas Stach Cc: Russell King Cc: Christian Gmeiner Cc: etnaviv@lists.freedesktop.org --- drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 30 +++++++++++---------------- 1 file changed, 12 insertions(+), 18 deletions(-) diff --git a/drivers/gpu/drm/etnaviv/etnaviv_gpu.c b/drivers/gpu/drm/etnaviv/etnaviv_gpu.c index 51320eeebfcf..310382812029 100644 --- a/drivers/gpu/drm/etnaviv/etnaviv_gpu.c +++ b/drivers/gpu/drm/etnaviv/etnaviv_gpu.c @@ -1629,7 +1629,6 @@ static int etnaviv_gpu_hw_suspend(struct etnaviv_gpu *gpu) return etnaviv_gpu_clk_disable(gpu); } -#ifdef CONFIG_PM static int etnaviv_gpu_hw_resume(struct etnaviv_gpu *gpu) { int ret; @@ -1645,7 +1644,6 @@ static int etnaviv_gpu_hw_resume(struct etnaviv_gpu *gpu) return 0; } -#endif static int etnaviv_gpu_cooling_get_max_state(struct thermal_cooling_device *cdev, @@ -1713,11 +1711,10 @@ static int etnaviv_gpu_bind(struct device *dev, struct device *master, if (ret) goto out_workqueue; -#ifdef CONFIG_PM - ret = pm_runtime_get_sync(gpu->dev); -#else - ret = etnaviv_gpu_clk_enable(gpu); -#endif + if (IS_ENABLED(CONFIG_PM)) + ret = pm_runtime_get_sync(gpu->dev); + else + ret = etnaviv_gpu_clk_enable(gpu); if (ret < 0) goto out_sched; @@ -1761,12 +1758,12 @@ static void etnaviv_gpu_unbind(struct device *dev, struct device *master, etnaviv_sched_fini(gpu); -#ifdef CONFIG_PM - pm_runtime_get_sync(gpu->dev); - pm_runtime_put_sync_suspend(gpu->dev); -#else - etnaviv_gpu_hw_suspend(gpu); -#endif + if (IS_ENABLED(CONFIG_PM)) { + pm_runtime_get_sync(gpu->dev); + pm_runtime_put_sync_suspend(gpu->dev); + } else { + etnaviv_gpu_hw_suspend(gpu); + } if (gpu->mmu_context) etnaviv_iommu_context_put(gpu->mmu_context); @@ -1880,7 +1877,6 @@ static int etnaviv_gpu_platform_remove(struct platform_device *pdev) return 0; } -#ifdef CONFIG_PM static int etnaviv_gpu_rpm_suspend(struct device *dev) { struct etnaviv_gpu *gpu = dev_get_drvdata(dev); @@ -1923,18 +1919,16 @@ static int etnaviv_gpu_rpm_resume(struct device *dev) return 0; } -#endif static const struct dev_pm_ops etnaviv_gpu_pm_ops = { - SET_RUNTIME_PM_OPS(etnaviv_gpu_rpm_suspend, etnaviv_gpu_rpm_resume, - NULL) + RUNTIME_PM_OPS(etnaviv_gpu_rpm_suspend, etnaviv_gpu_rpm_resume, NULL) }; struct platform_driver etnaviv_gpu_driver = { .driver = { .name = "etnaviv-gpu", .owner = THIS_MODULE, - .pm = &etnaviv_gpu_pm_ops, + .pm = pm_ptr(&etnaviv_gpu_pm_ops), .of_match_table = etnaviv_gpu_match, }, .probe = etnaviv_gpu_platform_probe, -- 2.35.1