iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

powerpc/sysfs: Move #ifdef CONFIG_HOTPLUG_CPU out of the function body

Browse Source 
The entire body of unregister_cpu_online() is inside an #ifdef
CONFIG_HOTPLUG_CPU block. This is ugly and means we create an empty function
when hotplug is disabled for no reason.

Instead move the #ifdef out of the function body and define the function to be
NULL in the else case. This means we'll pass NULL to cpuhp_setup_state(), but
that's fine because it accepts NULL to mean there is no teardown callback, which
is exactly what we want.

Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
This commit is contained in:
Michael Ellerman 2017-04-24 20:46:59 +10:00
parent 687b8f24f1
commit 3f2290e1b5
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arch/powerpc/kernel/sysfs.c
View File

@ -789,9 +789,9 @@ static int register_cpu_online(unsigned int cpu)
return 0; return 0;
} }
#ifdef CONFIG_HOTPLUG_CPU
static int unregister_cpu_online(unsigned int cpu) static int unregister_cpu_online(unsigned int cpu)
{ {
#ifdef CONFIG_HOTPLUG_CPU
struct cpu *c = &per_cpu(cpu_devices, cpu); struct cpu *c = &per_cpu(cpu_devices, cpu);
struct device *s = &c->dev; struct device *s = &c->dev;
struct device_attribute *attrs, *pmc_attrs; struct device_attribute *attrs, *pmc_attrs;
@ -870,9 +870,11 @@ static int unregister_cpu_online(unsigned int cpu)
cacheinfo_cpu_offline(cpu); cacheinfo_cpu_offline(cpu);
of_node_put(s->of_node); of_node_put(s->of_node);
s->of_node = NULL; s->of_node = NULL;
#endif /* CONFIG_HOTPLUG_CPU */
return 0; return 0;
} }
#else /* !CONFIG_HOTPLUG_CPU */
#define unregister_cpu_online NULL
#endif
#ifdef CONFIG_ARCH_CPU_PROBE_RELEASE #ifdef CONFIG_ARCH_CPU_PROBE_RELEASE
ssize_t arch_cpu_probe(const char *buf, size_t count) ssize_t arch_cpu_probe(const char *buf, size_t count)