From patchwork Mon Nov 7 17:52:43 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Cercueil X-Patchwork-Id: 16604 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp2201555wru; Mon, 7 Nov 2022 09:55:53 -0800 (PST) X-Google-Smtp-Source: AMsMyM4JSkjX0BGGU4f/ZFVgCIFCSO0uyMg5hGMlf8gSJCoNwptqGyfptJGDctxnEvO+KM0ANrph X-Received: by 2002:a63:ce54:0:b0:46a:e2a9:c7f6 with SMTP id r20-20020a63ce54000000b0046ae2a9c7f6mr43327283pgi.264.1667843752684; Mon, 07 Nov 2022 09:55:52 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1667843752; cv=none; d=google.com; s=arc-20160816; b=jaMykstsVru+zI5MlveMOtKeSu/dfVeQ7WdmRQ/8wHHeix8WmIwYjnO1tXMlacLhz/ wG21cA1NA6JQwIrugilC2OykZL9l4UN4Q88Nqf99omSmN3OVuupvGZ8HTAi1rKOeUzwd gHJmS35OXiEtekugdQxxp6ZkzChlmo09eKjqRHfRpJ0qVkvOWP+gB3et6doIA3XD+Xtk eq/c3lGn50dTY5266cKwT+pkR1VBHLtBhkbIbTTmYUOSYuLdK4k8nWoakYQBOvpuqZ4e ZbC3P7qBeuUG+9vWMLKaAYQzTOObf6yDg1HHzcbRTarR2HxJFpbZvF2hLbjcZgWhi4CE TRUQ== 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=oLSCl2S+9wY6fS7zP08oeDENmUBhHAKrTQR+Y/08Bpk=; b=PTCSFJwB7/ujv9+1e2wvi17C1B9CHe6X4yjCX2rW4t17JciJ3pOiKjGwNmo/ykbVCY 9azbjavsQuluA44wHWX6KuB4YY6+NETJqVakCfAV8uF7SnXBUdh6lLtdoU8I4LmfF/rc wbpyIiSJ7XBWkcYrJKxTg4cjIpduQ6JubbFqkmbxVoe0mNNGVbZGxoL/ucCyKP4GhZ2W JElPaP6RrfRwrrt/DEa9LDah2qCHpE5yccsacbGjT56oQcTl/dkYgPyJOuZdWoovWMTH 0/WuuKgqLFFXUTR0UmhGvllOoIt/soC+OVN7fb4UAKsG2EnStSKAaNQdNl8Td0Mwz1wa NGEg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@crapouillou.net header.s=mail header.b=mkU8crk9; 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 195-20020a6305cc000000b0043a93738a14si12689302pgf.167.2022.11.07.09.55.38; Mon, 07 Nov 2022 09:55:52 -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=mkU8crk9; 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 S232290AbiKGRzR (ORCPT + 99 others); Mon, 7 Nov 2022 12:55:17 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59298 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232553AbiKGRyO (ORCPT ); Mon, 7 Nov 2022 12:54:14 -0500 Received: from aposti.net (aposti.net [89.234.176.197]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3B50B25C63 for ; Mon, 7 Nov 2022 09:53:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=crapouillou.net; s=mail; t=1667843587; 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=oLSCl2S+9wY6fS7zP08oeDENmUBhHAKrTQR+Y/08Bpk=; b=mkU8crk9GOxL+1sgtDd44aIHu0bKdSFagIj6jsS5LZTBSPEADcbkgw8s6BhFogPq2tcldO iav9GnlhcJ44bH9vGqch8LPPes0swuLY7a6IAjYtAiUedYLWzyhvgKepOI4GNi9cYl9kPl 02S63wx2+svEZJQnFySuzCQtLgO6IIc= 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 , Stefan Agner , Alison Wang Subject: [PATCH 13/26] drm: fsl-dcu: Remove #ifdef guards for PM related functions Date: Mon, 7 Nov 2022 17:52:43 +0000 Message-Id: <20221107175256.360839-3-paul@crapouillou.net> In-Reply-To: <20221107175256.360839-1-paul@crapouillou.net> References: <20221107175106.360578-1-paul@crapouillou.net> <20221107175256.360839-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?1748860930667997018?= X-GMAIL-MSGID: =?utf-8?q?1748860930667997018?= 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 b4acc3422ba4..5aa6ca451ddc 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, }, };