From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 815577E for ; Wed, 2 Nov 2022 02:34:51 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 51536C433D7; Wed, 2 Nov 2022 02:34:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1667356491; bh=SCx5JyHt9WJlokpNbpKbbgwoqxNCj7ZAqFB3m/to5Fk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UfMi/3vjh2MJp2yednyELpgJ1iFlY4aiUxZfWc+8+1ROMSPzAGDlv4gmbWjvoVF3H 1O3aHbfJ+yILWpxGoMUA2cUJeWKXH3tqXp6h3oM6NfNxJerlqrchcuRD29Y9KXZ7hh hnX3VQUuf8qPnFGWsqML3zdB61FCbGawSaPpdmWc= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Shyam Sundar S K , Hans de Goede , Jaak Ristioja Subject: [PATCH 6.0 001/240] platform/x86/amd: pmc: remove CONFIG_DEBUG_FS checks Date: Wed, 2 Nov 2022 03:29:36 +0100 Message-Id: <20221102022111.441049514@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221102022111.398283374@linuxfoundation.org> References: <20221102022111.398283374@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From: Shyam Sundar S K commit b37fe34c83099ba5105115f8287c5546af1f0a05 upstream. Since linux/debugfs.h already has the stubs for the used debugfs functions when debugfs is not enabled, remove the #ifdef CONFIG_DEBUG_FS checks. Signed-off-by: Shyam Sundar S K Link: https://lore.kernel.org/r/20220922175608.630046-1-Shyam-sundar.S-k@amd.com Reviewed-by: Hans de Goede Signed-off-by: Hans de Goede Cc: Jaak Ristioja Signed-off-by: Greg Kroah-Hartman --- drivers/platform/x86/amd/pmc.c | 12 ------------ 1 file changed, 12 deletions(-) --- a/drivers/platform/x86/amd/pmc.c +++ b/drivers/platform/x86/amd/pmc.c @@ -151,9 +151,7 @@ struct amd_pmc_dev { struct device *dev; struct pci_dev *rdev; struct mutex lock; /* generic mutex lock */ -#if IS_ENABLED(CONFIG_DEBUG_FS) struct dentry *dbgfs_dir; -#endif /* CONFIG_DEBUG_FS */ }; static bool enable_stb; @@ -369,7 +367,6 @@ static void amd_pmc_validate_deepest(str } #endif -#ifdef CONFIG_DEBUG_FS static int smu_fw_info_show(struct seq_file *s, void *unused) { struct amd_pmc_dev *dev = s->private; @@ -504,15 +501,6 @@ static void amd_pmc_dbgfs_register(struc &amd_pmc_stb_debugfs_fops); } } -#else -static inline void amd_pmc_dbgfs_register(struct amd_pmc_dev *dev) -{ -} - -static inline void amd_pmc_dbgfs_unregister(struct amd_pmc_dev *dev) -{ -} -#endif /* CONFIG_DEBUG_FS */ static void amd_pmc_dump_registers(struct amd_pmc_dev *dev) {