* [PATCH] x86/pmc_atom: Fix warning when CONFIG_DEBUG_FS=n
@ 2014-09-16 4:24 Martin Kelly
2014-09-16 6:38 ` Ingo Molnar
0 siblings, 1 reply; 3+ messages in thread
From: Martin Kelly @ 2014-09-16 4:24 UTC (permalink / raw)
To: x86
Cc: vishwesh.m.rudramuni, joe, hpa, aubrey.li, linux-kernel,
Martin Kelly, Martin Kelly
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 fixes it up to eliminate "ret" when
CONFIG_DEBUG_FS=n.
Signed-off-by: Martin Kelly <martkell@amazon.com>
---
arch/x86/kernel/pmc_atom.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/arch/x86/kernel/pmc_atom.c b/arch/x86/kernel/pmc_atom.c
index 0c424a6..66e7d88 100644
--- a/arch/x86/kernel/pmc_atom.c
+++ b/arch/x86/kernel/pmc_atom.c
@@ -240,7 +240,9 @@ err:
static int pmc_setup_dev(struct pci_dev *pdev)
{
struct pmc_dev *pmc = &pmc_device;
+#ifdef CONFIG_DEBUG_FS
int ret;
+#endif /* CONFIG_DEBUG_FS */
/* Obtain ACPI base address */
pci_read_config_dword(pdev, ACPI_BASE_ADDR_OFFSET, &acpi_base_addr);
--
2.1.0
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] x86/pmc_atom: Fix warning when CONFIG_DEBUG_FS=n
2014-09-16 4:24 [PATCH] x86/pmc_atom: Fix warning when CONFIG_DEBUG_FS=n Martin Kelly
@ 2014-09-16 6:38 ` Ingo Molnar
2014-09-16 14:56 ` Martin Kelly
0 siblings, 1 reply; 3+ messages in thread
From: Ingo Molnar @ 2014-09-16 6:38 UTC (permalink / raw)
To: Martin Kelly
Cc: x86, vishwesh.m.rudramuni, joe, hpa, aubrey.li, linux-kernel,
Martin Kelly
* Martin Kelly <martin@martingkelly.com> wrote:
> 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 fixes it up to eliminate "ret" when
> CONFIG_DEBUG_FS=n.
>
> Signed-off-by: Martin Kelly <martkell@amazon.com>
> ---
> arch/x86/kernel/pmc_atom.c | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/arch/x86/kernel/pmc_atom.c b/arch/x86/kernel/pmc_atom.c
> index 0c424a6..66e7d88 100644
> --- a/arch/x86/kernel/pmc_atom.c
> +++ b/arch/x86/kernel/pmc_atom.c
> @@ -240,7 +240,9 @@ err:
> static int pmc_setup_dev(struct pci_dev *pdev)
> {
> struct pmc_dev *pmc = &pmc_device;
> +#ifdef CONFIG_DEBUG_FS
> int ret;
> +#endif /* CONFIG_DEBUG_FS */
>
> /* Obtain ACPI base address */
> pci_read_config_dword(pdev, ACPI_BASE_ADDR_OFFSET, &acpi_base_addr);
This uglifies the code which is bad. A nicer fix would be to
improve the code: for example define pmc_dbgfs_register() in the
!DEBUG_FS case as well, with a return 0 or so.
Thanks,
Ingo
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] x86/pmc_atom: Fix warning when CONFIG_DEBUG_FS=n
2014-09-16 6:38 ` Ingo Molnar
@ 2014-09-16 14:56 ` Martin Kelly
0 siblings, 0 replies; 3+ messages in thread
From: Martin Kelly @ 2014-09-16 14:56 UTC (permalink / raw)
To: Ingo Molnar
Cc: x86, vishwesh.m.rudramuni, joe, hpa, aubrey.li, linux-kernel,
Martin Kelly
On 09/15/2014 11:38 PM, Ingo Molnar wrote:
>
> This uglifies the code which is bad. A nicer fix would be to
> improve the code: for example define pmc_dbgfs_register() in the
> !DEBUG_FS case as well, with a return 0 or so.
>
> Thanks,
>
> Ingo
>
I like your suggestion and will issue a revision.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2014-09-16 14:56 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-09-16 4:24 [PATCH] x86/pmc_atom: Fix warning when CONFIG_DEBUG_FS=n Martin Kelly
2014-09-16 6:38 ` Ingo Molnar
2014-09-16 14:56 ` Martin Kelly
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox