diff options
author | Michael Ellerman <michael@ellerman.id.au> | 2008-04-24 01:13:19 -0400 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2008-04-24 07:08:12 -0400 |
commit | f7ebf352b2e04ee89efb426e33dd450d8f1cfcd5 (patch) | |
tree | 9a46055bfeb2ab5392cdef3650a000898b58f4c6 /arch/powerpc/platforms/pseries/setup.c | |
parent | cb1e2ab45a92b31114dfe6e34832a084f9b0b263 (diff) |
[POWERPC] Convert from DBG() to pr_debug() in platforms/pseries/
In pseries/lpar.c, fix some printf specifier mismatches, and add
a newline to one printk.
In pseries/rtasd.c add "rtasd" to some messages to make it clear
where they're coming from.
In pseries/scanlog.c remove the hand-rolled runtime debugging support
in there. This file has been largely unchanged for eons, if we need to
debug it in future we can recompile.
Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc/platforms/pseries/setup.c')
-rw-r--r-- | arch/powerpc/platforms/pseries/setup.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/arch/powerpc/platforms/pseries/setup.c b/arch/powerpc/platforms/pseries/setup.c index f66aa9c3b135..65e87951eda3 100644 --- a/arch/powerpc/platforms/pseries/setup.c +++ b/arch/powerpc/platforms/pseries/setup.c | |||
@@ -70,11 +70,6 @@ | |||
70 | #include "plpar_wrappers.h" | 70 | #include "plpar_wrappers.h" |
71 | #include "pseries.h" | 71 | #include "pseries.h" |
72 | 72 | ||
73 | #ifdef DEBUG | ||
74 | #define DBG(fmt...) udbg_printf(fmt) | ||
75 | #else | ||
76 | #define DBG(fmt...) | ||
77 | #endif | ||
78 | 73 | ||
79 | int fwnmi_active; /* TRUE if an FWNMI handler is present */ | 74 | int fwnmi_active; /* TRUE if an FWNMI handler is present */ |
80 | 75 | ||
@@ -326,7 +321,7 @@ static int pseries_set_xdabr(unsigned long dabr) | |||
326 | */ | 321 | */ |
327 | static void __init pSeries_init_early(void) | 322 | static void __init pSeries_init_early(void) |
328 | { | 323 | { |
329 | DBG(" -> pSeries_init_early()\n"); | 324 | pr_debug(" -> pSeries_init_early()\n"); |
330 | 325 | ||
331 | if (firmware_has_feature(FW_FEATURE_LPAR)) | 326 | if (firmware_has_feature(FW_FEATURE_LPAR)) |
332 | find_udbg_vterm(); | 327 | find_udbg_vterm(); |
@@ -338,7 +333,7 @@ static void __init pSeries_init_early(void) | |||
338 | 333 | ||
339 | iommu_init_early_pSeries(); | 334 | iommu_init_early_pSeries(); |
340 | 335 | ||
341 | DBG(" <- pSeries_init_early()\n"); | 336 | pr_debug(" <- pSeries_init_early()\n"); |
342 | } | 337 | } |
343 | 338 | ||
344 | /* | 339 | /* |
@@ -383,7 +378,7 @@ static int __init pSeries_probe(void) | |||
383 | of_flat_dt_is_compatible(root, "IBM,CBEA")) | 378 | of_flat_dt_is_compatible(root, "IBM,CBEA")) |
384 | return 0; | 379 | return 0; |
385 | 380 | ||
386 | DBG("pSeries detected, looking for LPAR capability...\n"); | 381 | pr_debug("pSeries detected, looking for LPAR capability...\n"); |
387 | 382 | ||
388 | /* Now try to figure out if we are running on LPAR */ | 383 | /* Now try to figure out if we are running on LPAR */ |
389 | of_scan_flat_dt(pSeries_probe_hypertas, NULL); | 384 | of_scan_flat_dt(pSeries_probe_hypertas, NULL); |
@@ -393,8 +388,8 @@ static int __init pSeries_probe(void) | |||
393 | else | 388 | else |
394 | hpte_init_native(); | 389 | hpte_init_native(); |
395 | 390 | ||
396 | DBG("Machine is%s LPAR !\n", | 391 | pr_debug("Machine is%s LPAR !\n", |
397 | (powerpc_firmware_features & FW_FEATURE_LPAR) ? "" : " not"); | 392 | (powerpc_firmware_features & FW_FEATURE_LPAR) ? "" : " not"); |
398 | 393 | ||
399 | return 1; | 394 | return 1; |
400 | } | 395 | } |