Skip to content

Commit ba74652

Browse files
committed
parisc: Print hardware IDs as 4 digit hex strings
The hardware IDs are 32-bit unsigned integers, so print them as 4-digit hex numbers. Additionally fix some whitespace glitches. Signed-off-by: Helge Deller <deller@gmx.de>
1 parent dcf6959 commit ba74652

1 file changed

Lines changed: 13 additions & 13 deletions

File tree

arch/parisc/kernel/processor.c

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* Initial setup-routines for HP 9000 based hardware.
44
*
55
* Copyright (C) 1991, 1992, 1995 Linus Torvalds
6-
* Modifications for PA-RISC (C) 1999-2008 Helge Deller <deller@gmx.de>
6+
* Modifications for PA-RISC (C) 1999-2026 Helge Deller <deller@gmx.de>
77
* Modifications copyright 1999 SuSE GmbH (Philipp Rumpf)
88
* Modifications copyright 2000 Martin K. Petersen <mkp@mkp.net>
99
* Modifications copyright 2000 Philipp Rumpf <prumpf@tux.org>
@@ -41,7 +41,7 @@ EXPORT_SYMBOL(_parisc_requires_coherency);
4141
DEFINE_PER_CPU(struct cpuinfo_parisc, cpu_data);
4242

4343
/*
44-
** PARISC CPU driver - claim "device" and initialize CPU data structures.
44+
** PARISC CPU driver - claim "device" and initialize CPU data structures.
4545
**
4646
** Consolidate per CPU initialization into (mostly) one module.
4747
** Monarch CPU will initialize boot_cpu_data which shouldn't
@@ -74,8 +74,8 @@ init_percpu_prof(unsigned long cpunum)
7474
* processor_probe - Determine if processor driver should claim this device.
7575
* @dev: The device which has been found.
7676
*
77-
* Determine if processor driver should claim this chip (return 0) or not
78-
* (return 1). If so, initialize the chip and tell other partners in crime
77+
* Determine if processor driver should claim this chip (return 0) or not
78+
* (return 1). If so, initialize the chip and tell other partners in crime
7979
* they have work to do.
8080
*/
8181
static int __init processor_probe(struct parisc_device *dev)
@@ -207,7 +207,7 @@ static int __init processor_probe(struct parisc_device *dev)
207207
}
208208
#endif
209209

210-
/*
210+
/*
211211
* Bring this CPU up now! (ignore bootstrap cpuid == 0)
212212
*/
213213
#ifdef CONFIG_SMP
@@ -241,25 +241,25 @@ void __init collect_boot_cpu_data(void)
241241
/* get CPU-Model Information... */
242242
#define p ((unsigned long *)&boot_cpu_data.pdc.model)
243243
if (pdc_model_info(&boot_cpu_data.pdc.model) == PDC_OK) {
244-
printk(KERN_INFO
245-
"model %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
246-
p[0], p[1], p[2], p[3], p[4], p[5], p[6], p[7], p[8], p[9]);
244+
pr_info("model 0x%04lx 0x%04lx 0x%04lx 0x%04lx 0x%04lx "
245+
"0x%04lx 0x%04lx 0x%04lx 0x%04lx 0x%04lx\n",
246+
p[0], p[1], p[2], p[3], p[4],
247+
p[5], p[6], p[7], p[8], p[9]);
247248

248249
add_device_randomness(&boot_cpu_data.pdc.model,
249250
sizeof(boot_cpu_data.pdc.model));
250251
}
251252
#undef p
252253

253254
if (pdc_model_versions(&boot_cpu_data.pdc.versions, 0) == PDC_OK) {
254-
printk(KERN_INFO "vers %08lx\n",
255-
boot_cpu_data.pdc.versions);
255+
pr_info("vers 0x%04lx\n", boot_cpu_data.pdc.versions);
256256

257257
add_device_randomness(&boot_cpu_data.pdc.versions,
258258
sizeof(boot_cpu_data.pdc.versions));
259259
}
260260

261261
if (pdc_model_cpuid(&boot_cpu_data.pdc.cpuid) == PDC_OK) {
262-
printk(KERN_INFO "CPUID vers %ld rev %ld (0x%08lx)\n",
262+
pr_info("CPUID vers %ld rev %ld (0x%04lx)\n",
263263
(boot_cpu_data.pdc.cpuid >> 5) & 127,
264264
boot_cpu_data.pdc.cpuid & 31,
265265
boot_cpu_data.pdc.cpuid);
@@ -437,8 +437,8 @@ show_cpuinfo (struct seq_file *m, void *v)
437437
boot_cpu_data.pdc.sys_model_name,
438438
cpu_name);
439439

440-
seq_printf(m, "hversion\t: 0x%08x\n"
441-
"sversion\t: 0x%08x\n",
440+
seq_printf(m, "hversion\t: 0x%04x\n"
441+
"sversion\t: 0x%04x\n",
442442
boot_cpu_data.hversion,
443443
boot_cpu_data.sversion );
444444

0 commit comments

Comments
 (0)