diff options
| author | Joe Perches <joe@perches.com> | 2012-05-21 19:50:07 -0700 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2012-06-06 09:17:22 +0200 |
| commit | c767a54ba0657e52e6edaa97cbe0b0a8bf1c1655 (patch) | |
| tree | d1430237ad10296e0e1a3d9b6f34c2bc56bcdfd7 /arch/x86/include/asm/pci_x86.h | |
| parent | f9ba7179ce91fb77b2adf6eaab3676ab3a1f5a15 (diff) | |
| download | linux-c767a54ba0657e52e6edaa97cbe0b0a8bf1c1655.tar.gz linux-c767a54ba0657e52e6edaa97cbe0b0a8bf1c1655.tar.bz2 linux-c767a54ba0657e52e6edaa97cbe0b0a8bf1c1655.zip | |
x86/debug: Add KERN_<LEVEL> to bare printks, convert printks to pr_<level>
Use a more current logging style:
- Bare printks should have a KERN_<LEVEL> for consistency's sake
- Add pr_fmt where appropriate
- Neaten some macro definitions
- Convert some Ok output to OK
- Use "%s: ", __func__ in pr_fmt for summit
- Convert some printks to pr_<level>
Message output is not identical in all cases.
Signed-off-by: Joe Perches <joe@perches.com>
Cc: levinsasha928@gmail.com
Link: http://lkml.kernel.org/r/1337655007.24226.10.camel@joe2Laptop
[ merged two similar patches, tidied up the changelog ]
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/include/asm/pci_x86.h')
| -rw-r--r-- | arch/x86/include/asm/pci_x86.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/arch/x86/include/asm/pci_x86.h b/arch/x86/include/asm/pci_x86.h index b3a531746026..5ad24a89b19b 100644 --- a/arch/x86/include/asm/pci_x86.h +++ b/arch/x86/include/asm/pci_x86.h @@ -7,9 +7,13 @@ #undef DEBUG #ifdef DEBUG -#define DBG(x...) printk(x) +#define DBG(fmt, ...) printk(fmt, ##__VA_ARGS__) #else -#define DBG(x...) +#define DBG(fmt, ...) \ +do { \ + if (0) \ + printk(fmt, ##__VA_ARGS__); \ +} while (0) #endif #define PCI_PROBE_BIOS 0x0001 |