| Message ID | 2830e8982942088a5dc882980045d924ef6e4a90.1676711562.git.christophe.leroy@csgroup.eu (mailing list archive) |
|---|---|
| State | Changes Requested |
| Headers | show |
| Series | [v2,01/10] powerpc/machdep: Make machine name const | expand |
| Context | Check | Description |
|---|---|---|
| snowpatch_ozlabs/github-powerpc_selftests | success | Successfully ran 8 jobs. |
| snowpatch_ozlabs/github-powerpc_ppctests | success | Successfully ran 8 jobs. |
| snowpatch_ozlabs/github-powerpc_sparse | success | Successfully ran 4 jobs. |
| snowpatch_ozlabs/github-powerpc_kernel_qemu | success | Successfully ran 24 jobs. |
| snowpatch_ozlabs/github-powerpc_clang | success | Successfully ran 6 jobs. |
diff --git a/arch/powerpc/platforms/85xx/mpc85xx_cds.c b/arch/powerpc/platforms/85xx/mpc85xx_cds.c index 41079d02dee8..dd969311b78e 100644 --- a/arch/powerpc/platforms/85xx/mpc85xx_cds.c +++ b/arch/powerpc/platforms/85xx/mpc85xx_cds.c @@ -318,6 +318,7 @@ static void __init mpc85xx_cds_setup_arch(void) { struct device_node *np; int cds_pci_slot; + char buf[40]; ppc_md_progress("mpc85xx_cds_setup_arch()", 0); @@ -334,13 +335,9 @@ static void __init mpc85xx_cds_setup_arch(void) return; } - if (ppc_md.progress) { - char buf[40]; - cds_pci_slot = ((in_8(&cadmus->cm_csr) >> 6) & 0x3) + 1; - snprintf(buf, 40, "CDS Version = 0x%x in slot %d\n", - in_8(&cadmus->cm_ver), cds_pci_slot); - ppc_md_progress(buf, 0); - } + cds_pci_slot = ((in_8(&cadmus->cm_csr) >> 6) & 0x3) + 1; + snprintf(buf, 40, "CDS Version = 0x%x in slot %d\n", in_8(&cadmus->cm_ver), cds_pci_slot); + ppc_md_progress(buf, 0); #ifdef CONFIG_PCI ppc_md.pci_irq_fixup = mpc85xx_cds_pci_irq_fixup;
mpc85xx_cds_setup_arch() is not a hot path, creating the string to be printed even when it doesn't get printed at the end is not an problem. Do it at all time. Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu> --- arch/powerpc/platforms/85xx/mpc85xx_cds.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-)