diff options
| author | Martin Kelly | 2014-09-17 16:17:56 +0200 |
|---|---|---|
| committer | Ingo Molnar | 2014-09-19 13:02:21 +0200 |
| commit | 9575a6a23a8081bc4c9d47d001621e2af0957c02 (patch) | |
| tree | d958d816fa75d6f2c779a6dfb936258986c7c9fb /arch/x86/kernel | |
| parent | x86: HPET force enable for e6xx based systems (diff) | |
| download | kernel-qcow2-linux-9575a6a23a8081bc4c9d47d001621e2af0957c02.tar.gz kernel-qcow2-linux-9575a6a23a8081bc4c9d47d001621e2af0957c02.tar.xz kernel-qcow2-linux-9575a6a23a8081bc4c9d47d001621e2af0957c02.zip | |
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>
Diffstat (limited to 'arch/x86/kernel')
| -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: pmc_dbgfs_unregister(pmc); return -ENODEV; } +#else +static int pmc_dbgfs_register(struct pmc_dev *pmc, struct pci_dev *pdev) +{ + return 0; +} #endif /* CONFIG_DEBUG_FS */ static int pmc_setup_dev(struct pci_dev *pdev) @@ -262,14 +267,12 @@ static int pmc_setup_dev(struct pci_dev *pdev) /* PMC hardware registers setup */ pmc_hw_reg_setup(pmc); -#ifdef CONFIG_DEBUG_FS ret = pmc_dbgfs_register(pmc, pdev); if (ret) { iounmap(pmc->regmap); - return ret; } -#endif /* CONFIG_DEBUG_FS */ - return 0; + + return ret; } /* |