Re: [PATCH v2] x86/pmc_atom: Fix warning when CONFIG_DEBUG_FS=n

Li, Aubrey
2014-09-17T02:09:27Z

On 2014/9/17 8:49, Martin Kelly 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 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>

Thanks to take care of this warning. How about this version?

diff --git a/arch/x86/kernel/pmc_atom.c b/arch/x86/kernel/pmc_atom.c
index 0c424a6..cd91b57 100644
--- a/arch/x86/kernel/pmc_atom.c
+++ b/arch/x86/kernel/pmc_atom.c
@@ -240,7 +240,7 @@ err:
static int pmc_setup_dev(struct pci_dev *pdev)
{
struct pmc_dev *pmc = &pmc_device;
- int ret;
+ int ret = 0;

/* Obtain ACPI base address */
pci_read_config_dword(pdev, ACPI_BASE_ADDR_OFFSET, &acpi_base_addr);
@@ -269,7 +269,7 @@ static int pmc_setup_dev(struct pci_dev *pdev)
return ret;
}
#endif /* CONFIG_DEBUG_FS */
- return 0;
+ return ret;
}

/*

Thanks,
-Aubrey

> ---
> Changes in v2:
> - Implemented Ingo Molnar's suggestion to #ifdef the function rather
> than the lines.
> ---
> arch/x86/kernel/pmc_atom.c | 7 +++++--
> 1 file changed, 5 insertions(+), 2 deletions(-)
>
> diff --git a/arch/x86/kernel/pmc_atom.c b/arch/x86/kernel/pmc_atom.c
> index 0c424a6..d06527a 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,13 +267,11 @@ 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;
> }
>
>