From patchwork Tue Nov 29 19:17:20 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Cercueil X-Patchwork-Id: 27435 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp524471wrr; Tue, 29 Nov 2022 11:21:56 -0800 (PST) X-Google-Smtp-Source: AA0mqf5365hrFYBtWAxUKkCwFRJFNiqKoehojHHjq6CQuGQpZfdCgGZv6o0h0iy8Wb+eYQpc9Jcx X-Received: by 2002:a05:6402:505:b0:46b:aa:856a with SMTP id m5-20020a056402050500b0046b00aa856amr13885432edv.171.1669749716092; Tue, 29 Nov 2022 11:21:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669749716; cv=none; d=google.com; s=arc-20160816; b=NhfVYL63LsAgpQLP2XOc54ZLFGiJAoSf2zJLGxDsNL8ja2fel0SBM31Nst+gt7GisA ejTSiUXaZC4126Bqv0AEmrcmeKvl9HNZ6FUA4yefJ8FDBa5v5tU1QFxyRmhdjRQR4AO0 HDo4RKK+dHBy3mfReQ7AnUwxJzAsdHvK4r4vuo8s3LPHRnsenz91N55ifNc7Krg+88ib WOjzu8PEbySlcQC0Ya9ds0NsjI2SmO6G9o6S/RLv6T6itsPO3r46XUiiiI1fchNahm0k Z0MH8NlFzIYqiDxa6K4ollJ1v8kBwX3PT/SO3o50PbX/UYS0QYf9IUKRN2/5tS3A32Vw +lOg== 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=xQiyTX8wK8bz1FK4zLI6UMcS5iFl/EIYvLZ25w1z2hk=; b=SNHtNSjeHgvPB5Ty6bibtMQX/Q2zYDRX0J3xKS9dmrQJNQBVdpwQUkPIj3KDJ8CWa1 ZaaiDR+j4JF4ayujjJDGgsv29erLokNtsQd4i9MqvDcNiveziByK1DTTpIHuHOkBmxN5 j2TSYKeVLPG1BLYas/KI766O/tWcN0cVS64fXCPkH9But0LtPAycY6P373Dr95YyWOgp 9rzPV7F68fNLMgdHlgF+z9fi5H3tf/VIcC+/S+do4Q3LKEzN5/ouUZl7nxeBemsoVqIz 6Itx3uqHSp8+qjWnvZHcldvLoOxF3lQE6l3CWv14kEdrRMvoyFHcImIeDl3PfGoli7Sr gkfg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@crapouillou.net header.s=mail header.b=UlZUjdqI; 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 ho42-20020a1709070eaa00b007c07a5fb437si4800649ejc.581.2022.11.29.11.21.32; Tue, 29 Nov 2022 11:21:56 -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=UlZUjdqI; 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 S236741AbiK2TU4 (ORCPT + 99 others); Tue, 29 Nov 2022 14:20:56 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56652 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236711AbiK2TUB (ORCPT ); Tue, 29 Nov 2022 14:20:01 -0500 Received: from aposti.net (aposti.net [89.234.176.197]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 332936A75F for ; Tue, 29 Nov 2022 11:19:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=crapouillou.net; s=mail; t=1669749487; 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=xQiyTX8wK8bz1FK4zLI6UMcS5iFl/EIYvLZ25w1z2hk=; b=UlZUjdqIcjHt0kk5+sXN+BbX4J3j2MtOsL/0PflEA0D3qoy5E1E2fGM88f29OjxBCmzgOl 0WfpBy7Xq9RhO88Nyq3YIZLqr6HVEkyjYIf47Q742qRyBaCLkHD8QzJGyRSonTAMRgnAap ZhAfRnXaME+QL3T5JfTA2tnSOAzECjs= From: Paul Cercueil To: David Airlie , Daniel Vetter Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Paul Cercueil , Stefan Agner , Alison Wang Subject: [PATCH v2 13/26] drm: fsl-dcu: Remove #ifdef guards for PM related functions Date: Tue, 29 Nov 2022 19:17:20 +0000 Message-Id: <20221129191733.137897-14-paul@crapouillou.net> In-Reply-To: <20221129191733.137897-1-paul@crapouillou.net> References: <20221129191733.137897-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?1750859478321957612?= X-GMAIL-MSGID: =?utf-8?q?1750859478321957612?= Use the DEFINE_SIMPLE_DEV_PM_OPS() and pm_sleep_ptr() macros to handle the .suspend/.resume callbacks. These macros allow the suspend and resume functions to be automatically dropped by the compiler when CONFIG_SUSPEND 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. Signed-off-by: Paul Cercueil --- Cc: Stefan Agner Cc: Alison Wang --- drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c b/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c index 8579c7629f5e..474ad45c73be 100644 --- a/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c +++ b/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c @@ -164,7 +164,6 @@ static const struct drm_driver fsl_dcu_drm_driver = { .minor = 1, }; -#ifdef CONFIG_PM_SLEEP static int fsl_dcu_drm_pm_suspend(struct device *dev) { struct fsl_dcu_drm_device *fsl_dev = dev_get_drvdata(dev); @@ -209,11 +208,9 @@ static int fsl_dcu_drm_pm_resume(struct device *dev) return 0; } -#endif -static const struct dev_pm_ops fsl_dcu_drm_pm_ops = { - SET_SYSTEM_SLEEP_PM_OPS(fsl_dcu_drm_pm_suspend, fsl_dcu_drm_pm_resume) -}; +static DEFINE_SIMPLE_DEV_PM_OPS(fsl_dcu_drm_pm_ops, + fsl_dcu_drm_pm_suspend, fsl_dcu_drm_pm_resume); static const struct fsl_dcu_soc_data fsl_dcu_ls1021a_data = { .name = "ls1021a", @@ -363,7 +360,7 @@ static struct platform_driver fsl_dcu_drm_platform_driver = { .remove = fsl_dcu_drm_remove, .driver = { .name = "fsl-dcu", - .pm = &fsl_dcu_drm_pm_ops, + .pm = pm_sleep_ptr(&fsl_dcu_drm_pm_ops), .of_match_table = fsl_dcu_of_match, }, };