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:   Wed, 7 Dec 2022 10:56:25 -0500
From:   Rodrigo Vivi <rodrigo.vivi@intel.com>
To:     Paul Cercueil <paul@crapouillou.net>
CC:     David Airlie <airlied@gmail.com>, Daniel Vetter <daniel@ffwll.ch>,
        <intel-gfx@lists.freedesktop.org>, <linux-kernel@vger.kernel.org>,
        <dri-devel@lists.freedesktop.org>
Subject: Re: [Intel-gfx] [PATCH v2 26/26] drm/i915/gt: Remove #ifdef guards
 for PM related functions
Message-ID: <Y5C3qTuNl9fhrO4/@intel.com>
References: <20221129191733.137897-1-paul@crapouillou.net>
 <20221129191942.138244-1-paul@crapouillou.net>
 <20221129191942.138244-13-paul@crapouillou.net>
Content-Type: text/plain; charset="us-ascii"
Content-Disposition: inline
In-Reply-To: <20221129191942.138244-13-paul@crapouillou.net>
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?keM9nxh1nbd9DdAL/knoYPIuY/K+8kRQlwK7OJMU9YHX1y4Xd+deUQPlGAIv?=
 =?us-ascii?Q?kOPjjSpjCqypaIdFkpDDTMpdv7N3DKj31VXUCoQzR8nOtugIdQKA+m8zCi/J?=
 =?us-ascii?Q?b2sv13BesyqQ8VRVK6EA0g8v5+BrfKlmn/WT3/sgP8mDEkavHMLKHbWReXmd?=
 =?us-ascii?Q?Yus3YFuzgqiUss4O1K9bp6GV9C2G7WJ6zDgDxeYWMkEu0+wAANkWTbJHJf9C?=
 =?us-ascii?Q?01N3UsZhzlg5hTvt6ZYmvnqk+sueH31fX5TU0MKcb8TuQrX3IzmStHJqcSXX?=
 =?us-ascii?Q?j0dghMyp4ngiOQZtcIcpeNUZWLZFI9lSacER/plEUjiBIcqmYnMyvH0nfwxL?=
 =?us-ascii?Q?CYTB6yp6clMYUB7vZgQVmISBD8LOGBWWIADRrRa++LzXlMehCvnVxoa1Js5R?=
 =?us-ascii?Q?6xo7fvKe6t4rGydYkvomB3eWg+j1OTgCLiL7altpseunplp1YqmmQ4PK/oWM?=
 =?us-ascii?Q?7F9z5pKcpdTYHnHnPt4S7Opw9nxoGd00gHIsM9FRs8t4w0I1xms8pwELx3KH?=
 =?us-ascii?Q?PJUENoLP+Azsu2seF6ESvPyBb+K1aZ8TFEwnfsvgff6oqF51qn1uCDsH04lN?=
 =?us-ascii?Q?78ppbhV5FpvEJBmKQZMujzDOyG8bPr+DTYnAD7ufoRG5knh6cT5md0I0PmAH?=
 =?us-ascii?Q?bLvGY/FV79mG9qY7zinm8HXKo/d1kOcUuJrCIB9FN4djvMGLX3M10lQtpvfC?=
 =?us-ascii?Q?tBL3+vbS494DVgq9/e6O8F+Dc1sPVHzX8b5TX6smmBS2gUsm1NZNAlybikuC?=
 =?us-ascii?Q?paLsZ1kAKuBm8DE071RQasQi/YCsDzlpNlGly08oxaDif2h4WkjrNg+CCx0O?=
 =?us-ascii?Q?90wZCfIBTrz3gOAx+PAyzv35CZjhdjFTGIuMAjJWAJQmRBYOwc/gOFyWcLUM?=
 =?us-ascii?Q?h689hiLtrb50NLOeA3jmbMrk9Uqso6O8UYBTCNC2GtvxjaTSNAizykdFDpx7?=
 =?us-ascii?Q?5dzh7GiEiYzDIBYi+4954Ro0S0uOVvRbeKtHLL+QegHP0zOqR4rfhFUsfL6F?=
 =?us-ascii?Q?up8sVTJhO1M2pA/fb34bi7RMBuPJnELhcbq851Xtc0pk3/OfkmDa/Qip3WyV?=
 =?us-ascii?Q?pfPqjFCLD3XQEHO/iZz0NYBtlTX16sCPC6mMu5mXR7IGDNFF27m6VYx0udJL?=
 =?us-ascii?Q?nss8rVzR1wwZWtEuQdawwLXBmsi/8T7DVRNTU5EhEI/zwAWTNSAMrRS9fyS1?=
 =?us-ascii?Q?+zTs9eMy5J3cAe+SnVm6QI97RJneZVv4ClbEQLvRNmv0kxPJsN6tCXl/yUJ8?=
 =?us-ascii?Q?S2M5O3bihtiEqMGdOeXCcOa1xCXfWvN+GW3VMvi1bbeliCWDAywsDY4jgO5y?=
 =?us-ascii?Q?wkQvTOzGeI5Sb29DGN/LAvHYkJ6MNONwt/iBwbQq9NpzfFvEckN9rJEw2IbJ?=
 =?us-ascii?Q?hBnG6qEGhRIdwPLW+HjrInuOVn/8TgZW40W2TqkzUIdodZIfeJlrJVusO+/w?=
 =?us-ascii?Q?XjJw/WHOgc4Igf/Dussrrs0zckpSufjjzdNSaVt0vnl2EE8I4IGL/Y2rNaRi?=
 =?us-ascii?Q?SuMvW0sYSedqTNfTiiZWwYXsR+2ZDIT9ii0I9ng39U6gVWX1v7tk9e24t+1U?=
 =?us-ascii?Q?0xy7VNQmdzu5DILKophAI4puUnsHwezgZymTGjaDynPynA437KSMIxpuoebe?=
 =?us-ascii?Q?+Q=3D=3D?=
X-MS-Exchange-CrossTenant-Network-Message-Id: 04f73dec-0b44-4a1d-efb0-08dad86b9aa5
X-MS-Exchange-CrossTenant-AuthSource: MN0PR11MB6059.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Dec 2022 15:56:29.7918
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 46c98d88-e344-4ed4-8496-4ed7712e255d
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: q/xWKYxQ8xLSp3L3Y3I226S4mj26AGnJaf2AnoJCMBV3qRahBP4yAbIMhfjHj8+msaLVVJmVOp1MUG2GAFmPFw==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN7PR11MB6898
X-OriginatorOrg: intel.com
X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,
        DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,
        SPF_HELO_NONE,SPF_NONE 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

On Tue, Nov 29, 2022 at 07:19:42PM +0000, Paul Cercueil wrote:
> Instead of defining two versions of intel_sysfs_rc6_init(), one for each
> value of CONFIG_PM, add a check on !IS_ENABLED(CONFIG_PM) early in the
> function. This will allow the compiler to automatically drop the dead
> code 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>
> ---
> Cc: Jani Nikula <jani.nikula@linux.intel.com>
> Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>


Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>


> Cc: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
> Cc: intel-gfx@lists.freedesktop.org
> ---
>  drivers/gpu/drm/i915/gt/intel_gt_sysfs_pm.c | 8 +-------
>  1 file changed, 1 insertion(+), 7 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/gt/intel_gt_sysfs_pm.c b/drivers/gpu/drm/i915/gt/intel_gt_sysfs_pm.c
> index cf71305ad586..09b9365ededd 100644
> --- a/drivers/gpu/drm/i915/gt/intel_gt_sysfs_pm.c
> +++ b/drivers/gpu/drm/i915/gt/intel_gt_sysfs_pm.c
> @@ -164,7 +164,6 @@ sysfs_gt_attribute_r_func(struct kobject *kobj, struct attribute *attr,
>  								 NULL);			\
>  	INTEL_GT_ATTR_RO(_name)
>  
> -#ifdef CONFIG_PM
>  static u32 get_residency(struct intel_gt *gt, enum intel_rc6_res_type id)
>  {
>  	intel_wakeref_t wakeref;
> @@ -300,7 +299,7 @@ static void intel_sysfs_rc6_init(struct intel_gt *gt, struct kobject *kobj)
>  {
>  	int ret;
>  
> -	if (!HAS_RC6(gt->i915))
> +	if (!IS_ENABLED(CONFIG_PM) || !HAS_RC6(gt->i915))
>  		return;
>  
>  	ret = __intel_gt_sysfs_create_group(kobj, rc6_attr_group);
> @@ -329,11 +328,6 @@ static void intel_sysfs_rc6_init(struct intel_gt *gt, struct kobject *kobj)
>  				 gt->info.id, ERR_PTR(ret));
>  	}
>  }
> -#else
> -static void intel_sysfs_rc6_init(struct intel_gt *gt, struct kobject *kobj)
> -{
> -}
> -#endif /* CONFIG_PM */
>  
>  static u32 __act_freq_mhz_show(struct intel_gt *gt)
>  {
> -- 
> 2.35.1
>