* [PATCH v3] x86/pmc_atom: Fix warning when CONFIG_DEBUG_FS=n
@ 2014-09-17 14:17 Martin Kelly
2014-09-18 23:52 ` Li, Aubrey
2014-09-19 11:48 ` [tip:x86/platform] x86/platform/pmc_atom: " tip-bot for Martin Kelly
0 siblings, 2 replies; 3+ messages in thread
From: Martin Kelly @ 2014-09-17 14:17 UTC (permalink / raw)
To: x86, mingo
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 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>
---
Changes in v3:
- Further unified the return code logic, as suggested by Ingo Molnar
Changes in v2:
- Implemented Ingo Molnar's suggestion to #ifdef the function rather
than the lines.
---
arch/x86/kernel/pmc_atom.c | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/arch/x86/kernel/pmc_atom.c b/arch/x86/kernel/pmc_atom.c
index 0c424a6..0ee5025e 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;
}
/*
--
2.1.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH v3] x86/pmc_atom: Fix warning when CONFIG_DEBUG_FS=n
2014-09-17 14:17 [PATCH v3] x86/pmc_atom: Fix warning when CONFIG_DEBUG_FS=n Martin Kelly
@ 2014-09-18 23:52 ` Li, Aubrey
2014-09-19 11:48 ` [tip:x86/platform] x86/platform/pmc_atom: " tip-bot for Martin Kelly
1 sibling, 0 replies; 3+ messages in thread
From: Li, Aubrey @ 2014-09-18 23:52 UTC (permalink / raw)
To: Martin Kelly, x86, mingo
Cc: vishwesh.m.rudramuni, joe, hpa, linux-kernel, Martin Kelly
On 2014/9/17 22:17, 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>
Looks good to me, thanks Martin!
> ---
> Changes in v3:
> - Further unified the return code logic, as suggested by Ingo Molnar
>
> Changes in v2:
> - Implemented Ingo Molnar's suggestion to #ifdef the function rather
> than the lines.
> ---
> arch/x86/kernel/pmc_atom.c | 11 +++++++----
> 1 file changed, 7 insertions(+), 4 deletions(-)
>
> diff --git a/arch/x86/kernel/pmc_atom.c b/arch/x86/kernel/pmc_atom.c
> index 0c424a6..0ee5025e 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;
> }
>
> /*
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* [tip:x86/platform] x86/platform/pmc_atom: Fix warning when CONFIG_DEBUG_FS=n
2014-09-17 14:17 [PATCH v3] x86/pmc_atom: Fix warning when CONFIG_DEBUG_FS=n Martin Kelly
2014-09-18 23:52 ` Li, Aubrey
@ 2014-09-19 11:48 ` tip-bot for Martin Kelly
1 sibling, 0 replies; 3+ messages in thread
From: tip-bot for Martin Kelly @ 2014-09-19 11:48 UTC (permalink / raw)
To: linux-tip-commits
Cc: linux-kernel, hpa, mingo, martin, tglx, aubrey.li, martkell
Commit-ID: 9575a6a23a8081bc4c9d47d001621e2af0957c02
Gitweb: http://git.kernel.org/tip/9575a6a23a8081bc4c9d47d001621e2af0957c02
Author: Martin Kelly <martin@martingkelly.com>
AuthorDate: Wed, 17 Sep 2014 07:17:56 -0700
Committer: Ingo Molnar <mingo@kernel.org>
CommitDate: Fri, 19 Sep 2014 13:02:21 +0200
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>
---
arch/x86/kernel/pmc_atom.c | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/arch/x86/kernel/pmc_atom.c b/arch/x86/kernel/pmc_atom.c
index 0c424a6..0ee5025e 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;
}
/*
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2014-09-19 11:49 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-09-17 14:17 [PATCH v3] x86/pmc_atom: Fix warning when CONFIG_DEBUG_FS=n Martin Kelly
2014-09-18 23:52 ` Li, Aubrey
2014-09-19 11:48 ` [tip:x86/platform] x86/platform/pmc_atom: " tip-bot for Martin Kelly
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).