diff options
| author | Nathan Lynch <nathanl@linux.ibm.com> | 2019-10-16 13:36:10 -0500 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2019-11-05 11:26:45 +1100 |
| commit | 3366ebe9e19ba3c672a00a6fb86f0ac8636ee989 (patch) | |
| tree | e3e5831ca94d163a3e20965c23ccba72079a983c /arch/powerpc/platforms | |
| parent | 505127068d9b705a6cf335143239db91bfe7bbe2 (diff) | |
powerpc/pseries: address checkpatch warnings in dlpar_offline_cpu
Remove some stray blank lines, convert a printk to pr_warn, and
address a line length violation.
One functional change: use WARN_ON instead of BUG_ON in case H_PROD of
a ceded thread yields an unexpected result from the platform. We can
expect this code path to get uninterruptibly stuck in __cpu_die() if
this happens, but that's more desirable than crashing.
Signed-off-by: Nathan Lynch <nathanl@linux.ibm.com>
Fixes: b6db63d1a7f0 ("pseries/pseries: Add code to online/offline CPUs of a DLPAR node")
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20191016183611.10867-2-nathanl@linux.ibm.com
Diffstat (limited to 'arch/powerpc/platforms')
| -rw-r--r-- | arch/powerpc/platforms/pseries/hotplug-cpu.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/arch/powerpc/platforms/pseries/hotplug-cpu.c b/arch/powerpc/platforms/pseries/hotplug-cpu.c index bbda646b63b5..f3f54ef645e1 100644 --- a/arch/powerpc/platforms/pseries/hotplug-cpu.c +++ b/arch/powerpc/platforms/pseries/hotplug-cpu.c @@ -539,7 +539,6 @@ static int dlpar_offline_cpu(struct device_node *dn) goto out; cpu_maps_update_begin(); break; - } /* @@ -547,19 +546,19 @@ static int dlpar_offline_cpu(struct device_node *dn) * Upgrade it's state to CPU_STATE_OFFLINE. */ set_preferred_offline_state(cpu, CPU_STATE_OFFLINE); - BUG_ON(plpar_hcall_norets(H_PROD, thread) - != H_SUCCESS); + WARN_ON(plpar_hcall_norets(H_PROD, thread) != H_SUCCESS); __cpu_die(cpu); break; } - if (cpu == num_possible_cpus()) - printk(KERN_WARNING "Could not find cpu to offline with physical id 0x%x\n", thread); + if (cpu == num_possible_cpus()) { + pr_warn("Could not find cpu to offline with physical id 0x%x\n", + thread); + } } cpu_maps_update_done(); out: return rc; - } static ssize_t dlpar_cpu_remove(struct device_node *dn, u32 drc_index) |