Received: by 2002:a05:6358:d09b:b0:dc:cd0c:909e with SMTP id jc27csp1346714rwb; Tue, 29 Nov 2022 12:15:42 -0800 (PST) X-Google-Smtp-Source: AA0mqf527usSzG5CmB5OuEl8RyhG5uyCfscgWU9rpQ1CQ9lREPYTwxny92TPVaLd+096V5S9GfGF X-Received: by 2002:a17:906:ca0e:b0:78c:1f2f:233e with SMTP id jt14-20020a170906ca0e00b0078c1f2f233emr35485703ejb.307.1669752942139; Tue, 29 Nov 2022 12:15:42 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669752942; cv=none; d=google.com; s=arc-20160816; b=Tm/925uam0mQz81G/z6J2+NkTBz8EKwPlz2+eG0EIwKK0hFj5gjbjOHi2ybEMeaImx k6apaqSxS8rdKnO+3dqaNfWV6d6rN5rlqM/5KxkRqsKkhzOLtrxLQ40Motc1j273kn+u RLvx9xi7tBJ8/hbSpalX4xW0TzKC+rG8LUdqdc1Yv2GTgZFxQ07Iuhqs/k2VzsGidncW 3y50jmqcuFMXvRfniBXID1khIVaDvMB0so8mN1YMV86PsnIc1N9FWZ/SKIJtPhOb9oU0 8Jgw8qskIfL83cQlUlPomuo6Gn3IGq+jdjmlMpWFXtxz2JfltCnj2lRw/P8INit84Uvm dlJg== 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=lqVfFv52JchqWhqd5naNqZXWO7Ga+Jlh4m1l9LJVtWWGc9Ct6g+AyoseNVBsKUYi38 fBPrxkO8RWUnvQkSQU4hopkKO3Vicgk3IM06coPQlomu90aBq45DT/xl9h+07yR+amIM u/SphNgl1m+5auFFW2W+CgSbGaXENWoX2PoiJhkGrCYXkirxhnFnUdfFdClzqzLFkI7v a757TppPo11HuXPEiq88++n4JM1IwkHrjNbxq1tJvdOC2VZJDVJAjyTXNJazs5rUrX6n rkBQ3JafE5vlgjLUdR68lm4z9+GU1MvBuS5bOOATTk3BoIZKoHE7SQG88Lqn4ilJ9wn5 pPvA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@crapouillou.net header.s=mail header.b=oAAQRcQg; 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 q17-20020a50cc91000000b00452697eda4csi12807729edi.58.2022.11.29.12.15.19; Tue, 29 Nov 2022 12:15:42 -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=oAAQRcQg; 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 S236846AbiK2TUg (ORCPT + 84 others); Tue, 29 Nov 2022 14:20:36 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56610 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236758AbiK2TTx (ORCPT ); Tue, 29 Nov 2022 14:19:53 -0500 Received: from aposti.net (aposti.net [89.234.176.197]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E513D64A14 for ; Tue, 29 Nov 2022 11:19:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=crapouillou.net; s=mail; t=1669749485; 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=oAAQRcQgD9K4LXINy5f2T/nA/jlNyRZOcC8NXXlWGwpy/l3A5SdfTRmG/Lw2BisVVu8cdQ ihXXlp+nRGtFcyI4infeVBvGjTVwJ+ViFasl5i8EqVe2XqcYZpmY8nidZvTYvl8RFWxNuV fHosxSym2KbYYpppjbtIf21nE3+tH9E= From: Paul Cercueil To: 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 v2 11/26] drm: bridge/dw-hdmi: Remove #ifdef guards for PM related functions Date: Tue, 29 Nov 2022 19:17:18 +0000 Message-Id: <20221129191733.137897-12-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 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 --- 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), }, }; -- 2.35.1