Convert from printk() to pr_*().
- Introduce helpers for printing debug messages, incl. dummies for
validating format strings when debugging is disabled,
- Convert from printk() to pr_*(),
- Drop superfluous casts,
- Add linebreaks before opening braces of function bodies.
Signed-off-by: Geert Uytterhoeven <[email protected]>
---
arch/m68k/mac/oss.c | 26 +++++++++++++++-----------
1 file changed, 15 insertions(+), 11 deletions(-)
diff --git a/arch/m68k/mac/oss.c b/arch/m68k/mac/oss.c
index 55d6592783f55710..e3c22370e9c6ee0d 100644
--- a/arch/m68k/mac/oss.c
+++ b/arch/m68k/mac/oss.c
@@ -26,6 +26,12 @@
#include <asm/mac_via.h>
#include <asm/mac_oss.h>
+#ifdef DEBUG_IRQS
+#define pr_irq(fmt, ...) printk(KERN_DEBUG pr_fmt(fmt), ##__VA_ARGS__)
+#else
+#define pr_irq(fmt, ...) no_printk(KERN_DEBUG pr_fmt(fmt), ##__VA_ARGS__)
+#endif
+
int oss_present;
volatile struct mac_oss *oss;
@@ -72,8 +78,8 @@ static void oss_irq(struct irq_desc *desc)
if ((console_loglevel == 10) && !(events & OSS_IP_SCSI)) {
unsigned int irq = irq_desc_get_irq(desc);
- printk("oss_irq: irq %u events = 0x%04X\n", irq,
- (int) oss->irq_pending);
+ pr_irq("oss_irq: irq %u events = 0x%04X\n", irq,
+ oss->irq_pending);
}
#endif
@@ -109,7 +115,7 @@ static void oss_nubus_irq(struct irq_desc *desc)
#ifdef DEBUG_NUBUS_INT
if (console_loglevel > 7) {
- printk("oss_nubus_irq: events = 0x%04X\n", events);
+ pr_info("oss_nubus_irq: events = 0x%04X\n", events);
}
#endif
/* There are only six slots on the OSS, not seven */
@@ -162,10 +168,9 @@ void __init oss_register_interrupts(void)
* level for that source to nonzero, thus enabling the interrupt.
*/
-void oss_irq_enable(int irq) {
-#ifdef DEBUG_IRQUSE
- printk("oss_irq_enable(%d)\n", irq);
-#endif
+void oss_irq_enable(int irq)
+{
+ pr_irq("oss_irq_enable(%d)\n", irq);
switch(irq) {
case IRQ_MAC_SCC:
oss->irq_level[OSS_IOPSCC] = OSS_IRQLEV_IOPSCC;
@@ -198,10 +203,9 @@ void oss_irq_enable(int irq) {
* to disable the interrupt.
*/
-void oss_irq_disable(int irq) {
-#ifdef DEBUG_IRQUSE
- printk("oss_irq_disable(%d)\n", irq);
-#endif
+void oss_irq_disable(int irq)
+{
+ pr_irq("oss_irq_disable(%d)\n", irq);
switch(irq) {
case IRQ_MAC_SCC:
oss->irq_level[OSS_IOPSCC] = 0;
--
1.9.1
