From patchwork Mon Nov 7 17:52:41 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paul Cercueil X-Patchwork-Id: 16602 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp2201265wru; Mon, 7 Nov 2022 09:55:21 -0800 (PST) X-Google-Smtp-Source: AA0mqf6F+6jNcI462jyG4W8C1H8jov4XHy4Ixb/bIvxPU76j7t+ThWy4qjkQltyrRZOgLumDr+Be X-Received: by 2002:a17:902:7ed7:b0:188:7a1f:8a28 with SMTP id p23-20020a1709027ed700b001887a1f8a28mr10447757plb.130.1667843721519; Mon, 07 Nov 2022 09:55:21 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1667843721; cv=none; d=google.com; s=arc-20160816; b=ALi30stDEMlsMp09GvNsRV0CoerSmTgjkr7YtIEqWfIu34Oyh+27jOe12cW6UcO65N Vbq7HxHkdoYjQRzYK4pLbHo4HomQ72PfwncQY0DvCfpC+xMILzTQ9T1uK4mqZ3Gq0WXp ojGz9nLvbtiEuj11rbHIaL1LlokYAjX49u0w3Dh0Zxf91CaPj1/QU6h8oq0/JU1IuiS/ 76gViaAvrv8I0bmYoQHdv3N+fszvxTpM+Df2lawromRgVIcJoxty76i0uEuqj5Et7DM9 CyeIEJJw31iLxJ7a6pq4hMtwe9rN0OWoGhBj+gwXAi6H+9fAGs3XsEYh66zBiwaAH/4O b+dg== 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=5+z/oCmrgfNuhQAhzbfugeqmZ78ZoFecrDmP1bKTWk8=; b=c3nsWLuADS8cFUouCVW2NbzNIjE1RQbKlgsp0wVSbm8nVY5ecoYWa2ifd4PlvhpKDQ DHJpjEI9FbOWHJLLF2IX/i4ioqLg9Zo+q9WaT2QP15rezrFYBjdPMdeTjWJ+qRT6cnR1 hh5jWAY7Wmqtw26UN2g6D1uJVrimCUagnGCQG9T45NuC8trZ5stVgPoUkui2TFDJl7hu AXIaMbyJ0/27M0U2E/iHKzIitrM/f/1GwPR8Uyn8EqNnlDFokh4YatqZfnWzov5i2xSg OX5moPzezt3nI+WB+5IfrmlnS0+Vg3HaRuxtFW/X/0soURhxRpms2BIzkldQAwunSfiA y7Tw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@crapouillou.net header.s=mail header.b=KGHwj+jf; 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 e4-20020a17090301c400b00177f35ce11fsi11866204plh.22.2022.11.07.09.55.07; Mon, 07 Nov 2022 09:55:21 -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=KGHwj+jf; 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 S232237AbiKGRyk (ORCPT + 99 others); Mon, 7 Nov 2022 12:54:40 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59514 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231580AbiKGRyG (ORCPT ); Mon, 7 Nov 2022 12:54:06 -0500 Received: from aposti.net (aposti.net [89.234.176.197]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6FF9D252BD for ; Mon, 7 Nov 2022 09:53:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=crapouillou.net; s=mail; t=1667843585; 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=5+z/oCmrgfNuhQAhzbfugeqmZ78ZoFecrDmP1bKTWk8=; b=KGHwj+jfA9G1xuTz36ToXIS3vucb81msxxeXvGUuUDbCqzZpRaWO38q8EHhxyQMFS8Whtj kUn1E8HBKyQnQijAKkoDIPjncRg1DpWtjlWQMERSwipljUQbnOEvSJ1s4tvHnQGMayp0eO iFcKtqwLpYC/EhxDdm9u44rF7VN6IJM= 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 , Andrzej Hajda , Neil Armstrong , Robert Foss , Laurent Pinchart , Jonas Karlman , Jernej Skrabec Subject: [PATCH 11/26] drm: bridge/dw-hdmi: Remove #ifdef guards for PM related functions Date: Mon, 7 Nov 2022 17:52:41 +0000 Message-Id: <20221107175256.360839-1-paul@crapouillou.net> In-Reply-To: <20221107175106.360578-1-paul@crapouillou.net> References: <20221107175106.360578-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?1748860898113864281?= X-GMAIL-MSGID: =?utf-8?q?1748860898113864281?= 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. The #ifdef IS_NOT_BROKEN guard was also changed to a IS_ENABLED(IS_NOT_BROKEN) check within the PM functions. Signed-off-by: Paul Cercueil Acked-by: Jyri Sarha --- Note: Checkpatch complains as I replaced a "#if defined(IS_NOT_BROKEN)" to a "if (IS_ENABLED(IS_NOT_BROKEN))". I don't really know how to make it better so I left it like that. Cc: Andrzej Hajda Cc: Neil Armstrong Cc: Robert Foss Cc: Laurent Pinchart Cc: Jonas Karlman Cc: Jernej Skrabec --- .../gpu/drm/bridge/synopsys/dw-hdmi-ahb-audio.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-ahb-audio.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-ahb-audio.c index 4efb62bcdb63..2ae231af7e4b 100644 --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-ahb-audio.c +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-ahb-audio.c @@ -593,7 +593,6 @@ static int snd_dw_hdmi_remove(struct platform_device *pdev) return 0; } -#if defined(CONFIG_PM_SLEEP) && defined(IS_NOT_BROKEN) /* * This code is fine, but requires implementation in the dw_hdmi_trigger() * method which is currently missing as I have no way to test this. @@ -602,7 +601,8 @@ static int snd_dw_hdmi_suspend(struct device *dev) { struct snd_dw_hdmi *dw = dev_get_drvdata(dev); - snd_power_change_state(dw->card, SNDRV_CTL_POWER_D3cold); + if (IS_ENABLED(IS_NOT_BROKEN)) + snd_power_change_state(dw->card, SNDRV_CTL_POWER_D3cold); return 0; } @@ -611,24 +611,21 @@ static int snd_dw_hdmi_resume(struct device *dev) { struct snd_dw_hdmi *dw = dev_get_drvdata(dev); - snd_power_change_state(dw->card, SNDRV_CTL_POWER_D0); + if (IS_ENABLED(IS_NOT_BROKEN)) + snd_power_change_state(dw->card, SNDRV_CTL_POWER_D0); return 0; } -static SIMPLE_DEV_PM_OPS(snd_dw_hdmi_pm, snd_dw_hdmi_suspend, - snd_dw_hdmi_resume); -#define PM_OPS &snd_dw_hdmi_pm -#else -#define PM_OPS NULL -#endif +static DEFINE_SIMPLE_DEV_PM_OPS(snd_dw_hdmi_pm_ops, snd_dw_hdmi_suspend, + snd_dw_hdmi_resume); static struct platform_driver snd_dw_hdmi_driver = { .probe = snd_dw_hdmi_probe, .remove = snd_dw_hdmi_remove, .driver = { .name = DRIVER_NAME, - .pm = PM_OPS, + .pm = pm_sleep_ptr(&snd_dw_hdmi_pm_ops), }, };