cputopology: always define CPU topology information, clean up

simplify drivers/base/topology.c a bit.

Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

diff --git a/drivers/base/topology.c b/drivers/base/topology.c
index 24d29a9fc25b087a4b3ff45b679b16393735cdca..f0cb270119302bd75d66ba388154adff26d75d1c 100644 (file)
--- a/drivers/base/topology.c
+++ b/drivers/base/topology.c
@@ -59,16 +59,14 @@ static ssize_t show_cpumap(int type, cpumask_t *mask, char *buf)
 static inline ssize_t show_##name(struct sys_device *dev, char *buf)   \
 {                                                                      \
        unsigned int cpu = dev->id;                                     \
-       cpumask_t siblings = topology_##name(cpu);                      \
-       return show_cpumap(0, &siblings, buf);                          \
+       return show_cpumap(0, &(topology_##name(cpu)), buf);            \
 }
 
 #define define_siblings_show_list(name)                                        \
 static inline ssize_t show_##name##_list(struct sys_device *dev, char *buf) \
 {                                                                      \
        unsigned int cpu = dev->id;                                     \
-       cpumask_t siblings = topology_##name(cpu);                      \
-       return show_cpumap(1, &siblings, buf);                          \
+       return show_cpumap(1, &(topology_##name(cpu)), buf);            \
 }
 
 #define define_siblings_show_func(name)                \