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;
Date:   Fri, 11 Nov 2022 16:27:50 +0200
From:   Laurentiu Palcu <laurentiu.palcu@oss.nxp.com>
To:     Paul Cercueil <paul@crapouillou.net>
Cc:     Maarten Lankhorst <maarten.lankhorst@linux.intel.com>,
        Maxime Ripard <mripard@kernel.org>,
        Thomas Zimmermann <tzimmermann@suse.de>,
        David Airlie <airlied@gmail.com>,
        Daniel Vetter <daniel@ffwll.ch>,
        dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org,
        Lucas Stach <l.stach@pengutronix.de>,
        Philipp Zabel <p.zabel@pengutronix.de>,
        Shawn Guo <shawnguo@kernel.org>,
        Sascha Hauer <s.hauer@pengutronix.de>,
        Pengutronix Kernel Team <kernel@pengutronix.de>,
        Fabio Estevam <festevam@gmail.com>,
        NXP Linux Team <linux-imx@nxp.com>,
        linux-arm-kernel@lists.infradead.org
Subject: Re: [PATCH 10/26] drm: imx/dcss: Remove #ifdef guards for PM related
 functions
Message-ID: <20221111142750.b6raolzxnfzxqeaf@fsr-ub1664-121.ea.freescale.net>
References: <20221107175106.360578-1-paul@crapouillou.net>
 <20221107175106.360578-11-paul@crapouillou.net>
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20221107175106.360578-11-paul@crapouillou.net>
MIME-Version: 1.0
X-MS-Exchange-MessageSentRepresentingType: 1
X-MS-PublicTrafficType: Email
X-MS-TrafficTypeDiagnostic: VI1PR0402MB3902:EE_|VE1PR04MB7248:EE_
X-MS-Office365-Filtering-Correlation-Id: a1f1bc0f-b75a-46ef-c46d-08dac3f0ec78
X-MS-Exchange-SharedMailbox-RoutingAgent-Processed: True
X-MS-Exchange-SenderADCheck: 1
X-MS-Exchange-AntiSpam-Relay: 0
X-Microsoft-Antispam: BCL:0;
X-Microsoft-Antispam-Message-Info: VXHRcWqvpFz4RAd/hEy5nwb6Ib1j044EQmEjntC+nG4jcwGMzxuDbnOlnSIEx67A+mQOtL6mFHZQodeAF7Cfok5HDE7iwsScBnB8vWTBjQfO//5xTVxBZkj8rbPHFaqGiH9YWYRcblEoHzl6NbA5xFmxFbnBTR/23Q12uwzhsZQqvIG2Ri6g1bBlIpL3A+b/N5I4D+ObGCFhfEB4D6X4by9cIgAO5QN6tYocSKSsSMruwwvg2JL8o4/wXgae9a0OxNhf2exP1zD8zzTzdI4kU6vjUKL24w7eMSvunuB08BVVbrINTPhywt6LafKB+FZztRkNrLluickvRURMbPZYAPfmmtMtoExUOFKHCCw6uTY1V++ZJG/GCprDo4xeqsDbl7wtel18Zw0ERsFZa/KxJlWHdgKGgsbxjGM0tmxfrjJL7dDsEnes1m5UVch+WIohlR9Mdi2AR18oVTwAitJdhj8Zh3EIT7Z8ABIVWBSgTDMVa9jzbzymt5wgVFBQRqNr8Fb5jFBfLVZ1eFpDGh0mosLwHsO96JgbVbiSp88bbNROsGspeEwrzMN6/qr0rsy79zIrWMHG9VTMjJrzWYT/ZMC7GDC1KnUbHnYiqbj+eHKaOgUuKQJBvEdXgVX/XQDYrYkvqz42xOnQkRWpyelDg91ECCltalk1HSsKtPTgi3MVP/eq1gp/rlBT14AYInXtWLn7n590pPeDp2pSLx9tsvVNldezq8Fnfjvq9fZJyq4KWfqQvR8t33uaAtdrRHQd
X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VI1PR0402MB3902.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230022)(4636009)(136003)(39860400002)(396003)(346002)(376002)(366004)(451199015)(316002)(8676002)(6916009)(54906003)(8936002)(4326008)(86362001)(41300700001)(186003)(1076003)(66946007)(66476007)(66556008)(7416002)(2906002)(5660300002)(83380400001)(6506007)(6666004)(6486002)(44832011)(6512007)(478600001)(26005)(9686003)(38100700002)(38350700002)(52116002);DIR:OUT;SFP:1101;
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?zpV1XkINKZEy+/1vPWZPiVv5zXEnDeDIqt8SNFi+sfMD1zyBj0bV3D/8kZDi?=
 =?us-ascii?Q?7q42G0qC1wbtdpJVR+oYW6QGcxizEMA4aiQClj3f6CddUVNWbtQ1FcFEII6t?=
 =?us-ascii?Q?eCViIKDgQ82Cz4drrcQfUCBj1uqnPJMRmZuTrHjcSPeHKLRJ592VATfISwzv?=
 =?us-ascii?Q?A9a4VD1cp8QcKlDgsXYxTDKPgqSR3rvKiOMFyIDYSeBr5D3pZq5TKn/WU7QE?=
 =?us-ascii?Q?4s4MiHVPmW73bWc5ZSm+G8AiO1UDPQqvlm0GkL+Xz0Nd1sT8qaceA1BWru6d?=
 =?us-ascii?Q?E0H9f58UWX69uR2/AHx1b82JpZklkQ7GEZo4owGVU9sozpuZ3KkdrQKgg/gu?=
 =?us-ascii?Q?AVGyXKM0wTAtpw+hssr2CiXLJbooKx+e4pCmDdT8Oy6OPmn3UnQlIaFJ3RFX?=
 =?us-ascii?Q?yp8dr7f/tZeK+o6pbDya+hzb8HINs+AfHa6GO0I53ph5SsIiM0Ww526arbIJ?=
 =?us-ascii?Q?t4cix5EaLcMfkAF/SZ5+M6EPgssZNN80/N4tB/j+Qy7ExUzTpGC6SS0AMG9y?=
 =?us-ascii?Q?x5kn70+phXZuPxpUxqevb4QpRBBBrGjRu85241OLPT+Cg29f3Ll4IX5iUY9B?=
 =?us-ascii?Q?dAOHuEv1SXCZhvlNPld7xCtlN8raVAm0G+84HqCtIve6AR29l05hJeUEBL85?=
 =?us-ascii?Q?7nJiRHSOaaeXmviP0+5TUro892Pu9xM1EiXKI56Zk2kerU+uEgVq7XU+pNMR?=
 =?us-ascii?Q?gjOad9y1i5zZgDeIyaa8CjyKfE4FwTdDqPeapuiwqkcYuPef2/6ZoI7Ik6y4?=
 =?us-ascii?Q?ytYiIqSJMR71YfjoGNQJEXkTb8FHiNUin6mHNClM4w7jDwje9xc9HO4JQTuC?=
 =?us-ascii?Q?iF1Xu8DPatmNtBP/3NTjtkkQbg7h7uF6yClmrPKS9+WvtG5Q+Sv/1lLaXRZJ?=
 =?us-ascii?Q?3dDqcxKNo9g1iqA8Gp81gKhVkheUe4ggs8p8ULPLBdNHcilzWQT7vVeUapkj?=
 =?us-ascii?Q?XwU2dqMUaRfRHGMnnVxfY9VTpLkjomrBCs6GGd3ASaGGP1izW2QoNKxCfWk3?=
 =?us-ascii?Q?apY7r2x1CcVD/MUB8dS3VqGb1YA0zZYkmoGUYx/ly50rXxmsU/kdTTOQG3nY?=
 =?us-ascii?Q?GJKF40XbuBHzK9QVmDGOmogQkScjLoh/UDeNchozmOhOXT7NrM3kOyahPWG6?=
 =?us-ascii?Q?OIwehZe3FXEOp/OvtI89yXRLElVh3Qq3oRlDTfgwdkKa6WnBcmaxFb4d2G6u?=
 =?us-ascii?Q?OCBprdvo34JAjgcunm3dg/5hdz/9jxXYoR1nvZ2gcv2szqritO1Av2fSiCAA?=
 =?us-ascii?Q?Qeoe3cZUzTfihOmyRlKJURQ95InPtrKiRAjf6NH2FfYH2ZsXbZ+UFXMfKHFi?=
 =?us-ascii?Q?I0vL07iJjbbYsjn+d12rKWQtTEKao3/hywiLDy9icfS+GOL5GpC3iuKEZ9Z6?=
 =?us-ascii?Q?rA2cLi9W2/dVhjwEkH7IMM5gErGkFBsRWI/CaJ65yXVjC+s0DToBben/A0Ys?=
 =?us-ascii?Q?Rus8sp1a4oQks+/ISvuxU6L6L3mykywZZhNyrGGysRsu2+M4X7FYWcvo+4Pi?=
 =?us-ascii?Q?pRoV6Vld9/fSWZBruzIxEmWTGe1LmKid5OK0jdQKIjKxg9mAM9JjFkBLhA68?=
 =?us-ascii?Q?MxMYvaOb2Qk5U1ym05U3wSSNy+MvgMLTHl9N0KGcQjCPflKmHO3F1c6JvFU+?=
 =?us-ascii?Q?Ew=3D=3D?=
X-OriginatorOrg: oss.nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: a1f1bc0f-b75a-46ef-c46d-08dac3f0ec78
X-MS-Exchange-CrossTenant-AuthSource: VI1PR0402MB3902.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Nov 2022 14:27:55.5438
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: zxQHyTPPtE9w5OdTZBiqiuaddyJ4s5uwMQ87gEf4aSB8FEd3aHJ4GNq1WSspIX6KrylMIcpwrCbxc7/wnwIWJw==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: VE1PR04MB7248
X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,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: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Hi Paul,

On Mon, Nov 07, 2022 at 05:50:50PM +0000, Paul Cercueil wrote:
> Use the EXPORT_GPL_DEV_PM_OPS() and pm_ptr() macros to handle the PM
> callbacks.
> 
> These macros allow the PM 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.
> 
> Signed-off-by: Paul Cercueil <paul@crapouillou.net>

Reviewed-by: Laurentiu Palcu <laurentiu.palcu@oss.nxp.com>
Tested-by: Laurentiu Palcu <laurentiu.palcu@oss.nxp.com>

Thanks,
Laurentiu

> ---
> Cc: Laurentiu Palcu <laurentiu.palcu@oss.nxp.com>
> Cc: Lucas Stach <l.stach@pengutronix.de>
> Cc: Philipp Zabel <p.zabel@pengutronix.de>
> Cc: Shawn Guo <shawnguo@kernel.org>
> Cc: Sascha Hauer <s.hauer@pengutronix.de>
> Cc: Pengutronix Kernel Team <kernel@pengutronix.de>
> Cc: Fabio Estevam <festevam@gmail.com>
> Cc: NXP Linux Team <linux-imx@nxp.com>
> Cc: linux-arm-kernel@lists.infradead.org
> ---
>  drivers/gpu/drm/imx/dcss/dcss-dev.c | 17 +++++++++--------
>  drivers/gpu/drm/imx/dcss/dcss-dev.h |  7 +++----
>  drivers/gpu/drm/imx/dcss/dcss-drv.c |  8 +-------
>  3 files changed, 13 insertions(+), 19 deletions(-)
> 
> diff --git a/drivers/gpu/drm/imx/dcss/dcss-dev.c b/drivers/gpu/drm/imx/dcss/dcss-dev.c
> index 3f5750cc2673..66d9233ffb98 100644
> --- a/drivers/gpu/drm/imx/dcss/dcss-dev.c
> +++ b/drivers/gpu/drm/imx/dcss/dcss-dev.c
> @@ -249,8 +249,7 @@ void dcss_dev_destroy(struct dcss_dev *dcss)
>  	kfree(dcss);
>  }
>  
> -#ifdef CONFIG_PM_SLEEP
> -int dcss_dev_suspend(struct device *dev)
> +static int dcss_dev_suspend(struct device *dev)
>  {
>  	struct dcss_dev *dcss = dcss_drv_dev_to_dcss(dev);
>  	struct drm_device *ddev = dcss_drv_dev_to_drm(dev);
> @@ -273,7 +272,7 @@ int dcss_dev_suspend(struct device *dev)
>  	return 0;
>  }
>  
> -int dcss_dev_resume(struct device *dev)
> +static int dcss_dev_resume(struct device *dev)
>  {
>  	struct dcss_dev *dcss = dcss_drv_dev_to_dcss(dev);
>  	struct drm_device *ddev = dcss_drv_dev_to_drm(dev);
> @@ -296,10 +295,8 @@ int dcss_dev_resume(struct device *dev)
>  
>  	return 0;
>  }
> -#endif /* CONFIG_PM_SLEEP */
>  
> -#ifdef CONFIG_PM
> -int dcss_dev_runtime_suspend(struct device *dev)
> +static int dcss_dev_runtime_suspend(struct device *dev)
>  {
>  	struct dcss_dev *dcss = dcss_drv_dev_to_dcss(dev);
>  	int ret;
> @@ -313,7 +310,7 @@ int dcss_dev_runtime_suspend(struct device *dev)
>  	return 0;
>  }
>  
> -int dcss_dev_runtime_resume(struct device *dev)
> +static int dcss_dev_runtime_resume(struct device *dev)
>  {
>  	struct dcss_dev *dcss = dcss_drv_dev_to_dcss(dev);
>  
> @@ -325,4 +322,8 @@ int dcss_dev_runtime_resume(struct device *dev)
>  
>  	return 0;
>  }
> -#endif /* CONFIG_PM */
> +
> +EXPORT_GPL_DEV_PM_OPS(dcss_dev_pm_ops) = {
> +	RUNTIME_PM_OPS(dcss_dev_runtime_suspend, dcss_dev_runtime_resume, NULL)
> +	SYSTEM_SLEEP_PM_OPS(dcss_dev_suspend, dcss_dev_resume)
> +};
> diff --git a/drivers/gpu/drm/imx/dcss/dcss-dev.h b/drivers/gpu/drm/imx/dcss/dcss-dev.h
> index 1e582270c6ea..f27b87c09599 100644
> --- a/drivers/gpu/drm/imx/dcss/dcss-dev.h
> +++ b/drivers/gpu/drm/imx/dcss/dcss-dev.h
> @@ -9,6 +9,7 @@
>  #include <drm/drm_fourcc.h>
>  #include <drm/drm_plane.h>
>  #include <linux/io.h>
> +#include <linux/pm.h>
>  #include <video/videomode.h>
>  
>  #define SET			0x04
> @@ -95,13 +96,11 @@ struct dcss_dev *dcss_drv_dev_to_dcss(struct device *dev);
>  struct drm_device *dcss_drv_dev_to_drm(struct device *dev);
>  struct dcss_dev *dcss_dev_create(struct device *dev, bool hdmi_output);
>  void dcss_dev_destroy(struct dcss_dev *dcss);
> -int dcss_dev_runtime_suspend(struct device *dev);
> -int dcss_dev_runtime_resume(struct device *dev);
> -int dcss_dev_suspend(struct device *dev);
> -int dcss_dev_resume(struct device *dev);
>  void dcss_enable_dtg_and_ss(struct dcss_dev *dcss);
>  void dcss_disable_dtg_and_ss(struct dcss_dev *dcss);
>  
> +extern const struct dev_pm_ops dcss_dev_pm_ops;
> +
>  /* BLKCTL */
>  int dcss_blkctl_init(struct dcss_dev *dcss, unsigned long blkctl_base);
>  void dcss_blkctl_cfg(struct dcss_blkctl *blkctl);
> diff --git a/drivers/gpu/drm/imx/dcss/dcss-drv.c b/drivers/gpu/drm/imx/dcss/dcss-drv.c
> index 1c70f70247f6..431510bd811b 100644
> --- a/drivers/gpu/drm/imx/dcss/dcss-drv.c
> +++ b/drivers/gpu/drm/imx/dcss/dcss-drv.c
> @@ -117,19 +117,13 @@ static const struct of_device_id dcss_of_match[] = {
>  
>  MODULE_DEVICE_TABLE(of, dcss_of_match);
>  
> -static const struct dev_pm_ops dcss_dev_pm = {
> -	SET_SYSTEM_SLEEP_PM_OPS(dcss_dev_suspend, dcss_dev_resume)
> -	SET_RUNTIME_PM_OPS(dcss_dev_runtime_suspend,
> -			   dcss_dev_runtime_resume, NULL)
> -};
> -
>  static struct platform_driver dcss_platform_driver = {
>  	.probe	= dcss_drv_platform_probe,
>  	.remove	= dcss_drv_platform_remove,
>  	.driver	= {
>  		.name = "imx-dcss",
>  		.of_match_table	= dcss_of_match,
> -		.pm = &dcss_dev_pm,
> +		.pm = pm_ptr(&dcss_dev_pm_ops),
>  	},
>  };
>  
> -- 
> 2.35.1
>