diff options
author | Martin Kelly <martin@martingkelly.com> | 2014-09-17 10:17:56 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2014-09-19 07:02:21 -0400 |
commit | 9575a6a23a8081bc4c9d47d001621e2af0957c02 (patch) | |
tree | d958d816fa75d6f2c779a6dfb936258986c7c9fb | |
parent | 2e151c70dfb0075ff83bec305c52a9da1ba49089 (diff) |
x86/platform/pmc_atom: Fix warning when CONFIG_DEBUG_FS=n
When compiling with CONFIG_DEBUG_FS=n, GCC emits an unused
variable warning for pmc_atom.c because "ret" is used only
within the CONFIG_DEBUG_FS block.
This patch adds a dummy #ifdef for pmc_dbgfs_register() when
CONFIG_DEBUG_FS=n to simplify the code and remove the warning.
Signed-off-by: Martin Kelly <martkell@amazon.com>
Acked-by: "Li, Aubrey" <aubrey.li@linux.intel.com>
Cc: vishwesh.m.rudramuni@intel.com
Link: http://lkml.kernel.org/r/1410963476-8360-1-git-send-email-martin@martingkelly.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
-rw-r--r-- | arch/x86/kernel/pmc_atom.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/arch/x86/kernel/pmc_atom.c b/arch/x86/kernel/pmc_atom.c index 0c424a67985d..0ee5025e0fa4 100644 --- a/arch/x86/kernel/pmc_atom.c +++ b/arch/x86/kernel/pmc_atom.c | |||
@@ -235,6 +235,11 @@ err: | |||
235 | pmc_dbgfs_unregister(pmc); | 235 | pmc_dbgfs_unregister(pmc); |
236 | return -ENODEV; | 236 | return -ENODEV; |
237 | } | 237 | } |
238 | #else | ||
239 | static int pmc_dbgfs_register(struct pmc_dev *pmc, struct pci_dev *pdev) | ||
240 | { | ||
241 | return 0; | ||
242 | } | ||
238 | #endif /* CONFIG_DEBUG_FS */ | 243 | #endif /* CONFIG_DEBUG_FS */ |
239 | 244 | ||
240 | static int pmc_setup_dev(struct pci_dev *pdev) | 245 | static int pmc_setup_dev(struct pci_dev *pdev) |
@@ -262,14 +267,12 @@ static int pmc_setup_dev(struct pci_dev *pdev) | |||
262 | /* PMC hardware registers setup */ | 267 | /* PMC hardware registers setup */ |
263 | pmc_hw_reg_setup(pmc); | 268 | pmc_hw_reg_setup(pmc); |
264 | 269 | ||
265 | #ifdef CONFIG_DEBUG_FS | ||
266 | ret = pmc_dbgfs_register(pmc, pdev); | 270 | ret = pmc_dbgfs_register(pmc, pdev); |
267 | if (ret) { | 271 | if (ret) { |
268 | iounmap(pmc->regmap); | 272 | iounmap(pmc->regmap); |
269 | return ret; | ||
270 | } | 273 | } |
271 | #endif /* CONFIG_DEBUG_FS */ | 274 | |
272 | return 0; | 275 | return ret; |
273 | } | 276 | } |
274 | 277 | ||
275 | /* | 278 | /* |