From patchwork Thu Jun 22 10:20:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 13288955 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 7DC8CEB64DB for ; Thu, 22 Jun 2023 10:20:46 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id CAC2310E082; Thu, 22 Jun 2023 10:20:45 +0000 (UTC) Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by gabe.freedesktop.org (Postfix) with ESMTPS id 0321610E52D; Thu, 22 Jun 2023 10:20:43 +0000 (UTC) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 6E37E61521; Thu, 22 Jun 2023 10:20:43 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 92EF0C433C8; Thu, 22 Jun 2023 10:20:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1687429242; bh=AWFPWNjgq8nDENgHhyxRM1ln3/MFL4dH5rZ97ud8+z4=; h=From:To:Cc:Subject:Date:From; b=lr5YgX/5QzEp2HSY7IaidtJuiAoPY0Sdmn1yD8o2RR7TCKFENJqN98bbcvWyw8QL9 dfiQV0eAQMuoDCNzDowXK3NNXkywINA+rE7Seabeig6ooXd5hBLA3d7CNvGCjDQrYg P8+6MAVeTnpurC0pJf5E3yAVtcJgispoud0+yPICWVtfdoNgVZgXIlIaPErK+SMu1s UYsEXR1vvuBUfD/mGPhMoc8vu+ZaHMi3jZbIIEyJxEt5SN6DK6GFRO0nVZONaPXLIn Uz1UmlHVPC+fzNv/xT6h4PkELS+4KVMHuBbwNOQQL7fwk43+7yIKrreShY1PPuew8L 3wrBu96nixZnw== From: Arnd Bergmann To: Alex Deucher , =?utf-8?q?Christian_K=C3=B6nig?= , "Pan, Xinhui" , David Airlie , Daniel Vetter , Evan Quan , Hawking Zhang , Wenhui Sheng , Guchun Chen Subject: [PATCH] drm/amdgpu: fix building without DEBUG_FS Date: Thu, 22 Jun 2023 12:20:26 +0200 Message-Id: <20230622102035.3552643-1-arnd@kernel.org> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: ZhenGuo Yin , Tong Liu01 , amd-gfx@lists.freedesktop.org, kernel test robot , Arnd Bergmann , Yiqing Yao , dri-devel@lists.freedesktop.org, Jonatas Esteves , Asad Kamal , linux-kernel@vger.kernel.org, Kent Russell , Kun Liu Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" From: Arnd Bergmann The debugfs file is defined unconditionally, but the registration is hidden in an #ifdef, which causes a warning: drivers/gpu/drm/amd/amdgpu/amdgpu_rap.c:110:37: error: unused variable 'amdgpu_rap_debugfs_ops' [-Werror,-Wunused-const-variable] static const struct file_operations amdgpu_rap_debugfs_ops = { ^ in amdgpu_pm.c, the same thing happens with the clocks[] variable: drivers/gpu/drm/amd/pm/amdgpu_pm.c:38:34: error: unused variable 'clocks' [-Werror,-Wunused-const-variable] static const struct cg_flag_name clocks[] = { ^ Since debugfs_create_file() does nothing when debugfs is disabled, removing the ifdefs makes the code more readable and also avoids both warnings. Fixes: a4322e1881bed ("drm/amdgpu: add debugfs interface for RAP test") Fixes: e098bc9612c2b ("drm/amd/pm: optimize the power related source code layout") Reported-by: kernel test robot Link: https://lore.kernel.org/oe-kbuild-all/202302200339.Whql7Emr-lkp@intel.com/ Signed-off-by: Arnd Bergmann --- drivers/gpu/drm/amd/amdgpu/amdgpu_rap.c | 2 -- drivers/gpu/drm/amd/pm/amdgpu_pm.c | 6 ------ 2 files changed, 8 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_rap.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_rap.c index 12010c988c8b5..123bcf5c2bb13 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_rap.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_rap.c @@ -116,7 +116,6 @@ static const struct file_operations amdgpu_rap_debugfs_ops = { void amdgpu_rap_debugfs_init(struct amdgpu_device *adev) { -#if defined(CONFIG_DEBUG_FS) struct drm_minor *minor = adev_to_drm(adev)->primary; if (!adev->psp.rap_context.context.initialized) @@ -124,5 +123,4 @@ void amdgpu_rap_debugfs_init(struct amdgpu_device *adev) debugfs_create_file("rap_test", S_IWUSR, minor->debugfs_root, adev, &amdgpu_rap_debugfs_ops); -#endif } diff --git a/drivers/gpu/drm/amd/pm/amdgpu_pm.c b/drivers/gpu/drm/amd/pm/amdgpu_pm.c index a57952b93e73f..ec39805b762e6 100644 --- a/drivers/gpu/drm/amd/pm/amdgpu_pm.c +++ b/drivers/gpu/drm/amd/pm/amdgpu_pm.c @@ -3565,8 +3565,6 @@ void amdgpu_pm_sysfs_fini(struct amdgpu_device *adev) /* * Debugfs info */ -#if defined(CONFIG_DEBUG_FS) - static void amdgpu_debugfs_prints_cpu_info(struct seq_file *m, struct amdgpu_device *adev) { uint16_t *p_val; @@ -3768,11 +3766,8 @@ static const struct file_operations amdgpu_debugfs_pm_prv_buffer_fops = { .llseek = default_llseek, }; -#endif - void amdgpu_debugfs_pm_init(struct amdgpu_device *adev) { -#if defined(CONFIG_DEBUG_FS) struct drm_minor *minor = adev_to_drm(adev)->primary; struct dentry *root = minor->debugfs_root; @@ -3789,5 +3784,4 @@ void amdgpu_debugfs_pm_init(struct amdgpu_device *adev) adev->pm.smu_prv_buffer_size); amdgpu_dpm_stb_debug_fs_init(adev); -#endif }