Re: [PATCH -tip] x86: k8.h reference to node in node_to_k8_nb_misc for !CONFIG_K8_NB

[Jaswinder Singh Rajput <jaswinder@kernel.org>]

On Tue, 2009-04-14 at 19:17 +0200, Ingo Molnar wrote:

> I.e. convert node_to_k8_nb_misc() from a macro to an inline 
> function. Same end result in terms of emitted instructions, 
> but the compiler now knows that 'node' is really used.
> 
> With a macro the preprocessor hid this fact from the 
> compiler, so the compiler only saw this in essence:
> 
>         int node = 0;
>         struct pci_dev *dev;
> 
> and thought that 'node' was unused. Hence it emitted a 
> warning. This is one reason why macros are bad - they hide 
> program logic from the compiler.
> 

Subject: [PATCH] x86: k8 convert node_to_k8_nb_misc() from a macro to an inline function

Converting node_to_k8_nb_misc() from a macro to an inline function
makes complier happy for !CONFIG_K8_NB so fixes compiler warnings:
  arch/x86/kernel/cpu/intel_cacheinfo.c: In function ‘show_cache_disable’:
  arch/x86/kernel/cpu/intel_cacheinfo.c:712: warning: unused variable ‘node’
  arch/x86/kernel/cpu/intel_cacheinfo.c: In function ‘store_cache_disable’:
  arch/x86/kernel/cpu/intel_cacheinfo.c:739: warning: unused variable ‘node’

Thanks to Ingo for the guidance.

Signed-off-by: Jaswinder Singh Rajput <jaswinderrajput@gmail.com>
---
 arch/x86/include/asm/k8.h |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/arch/x86/include/asm/k8.h b/arch/x86/include/asm/k8.h
index c23b3d1..c2d1f3b 100644
--- a/arch/x86/include/asm/k8.h
+++ b/arch/x86/include/asm/k8.h
@@ -13,10 +13,15 @@ extern void k8_flush_garts(void);
 extern int k8_scan_nodes(unsigned long start, unsigned long end);
 
 #ifdef CONFIG_K8_NB
-#define node_to_k8_nb_misc(node) \
-	(node < num_k8_northbridges) ? k8_northbridges[node] : NULL
+static inline struct pci_dev *node_to_k8_nb_misc(int node)
+{
+	return (node < num_k8_northbridges) ? k8_northbridges[node] : NULL;
+}
 #else
-#define node_to_k8_nb_misc(node) NULL
+static inline struct pci_dev *node_to_k8_nb_misc(int node)
+{
+	return NULL;
+}
 #endif
 
 
-- 
1.6.0.6