Merge tag 'iwlwifi-next-for-kalle-2014-12-30' of https://git.kernel.org/pub/scm/linux...

[cascardo/linux.git] / arch / arm / common / sa1111.c

diff --git a/arch/arm/common/sa1111.c b/arch/arm/common/sa1111.c
index cd5914c..5cc779c 100644 (file)
--- a/arch/arm/common/sa1111.c
+++ b/arch/arm/common/sa1111.c
@@ -282,8 +282,8 @@ static int sa1111_retrigger_lowirq(struct irq_data *d)
        }
 
        if (i == 8)
-               printk(KERN_ERR "Danger Will Robinson: failed to "
-                       "re-trigger IRQ%d\n", d->irq);
+               pr_err("Danger Will Robinson: failed to re-trigger IRQ%d\n",
+                      d->irq);
        return i == 8 ? -1 : 0;
 }
 
@@ -384,8 +384,8 @@ static int sa1111_retrigger_highirq(struct irq_data *d)
        }
 
        if (i == 8)
-               printk(KERN_ERR "Danger Will Robinson: failed to "
-                       "re-trigger IRQ%d\n", d->irq);
+               pr_err("Danger Will Robinson: failed to re-trigger IRQ%d\n",
+                      d->irq);
        return i == 8 ? -1 : 0;
 }
 
@@ -740,9 +740,8 @@ static int __sa1111_probe(struct device *me, struct resource *mem, int irq)
                goto err_unmap;
        }
 
-       printk(KERN_INFO "SA1111 Microprocessor Companion Chip: "
-               "silicon revision %lx, metal revision %lx\n",
-               (id & SKID_SIREV_MASK)>>4, (id & SKID_MTREV_MASK));
+       pr_info("SA1111 Microprocessor Companion Chip: silicon revision %lx, metal revision %lx\n",
+               (id & SKID_SIREV_MASK) >> 4, id & SKID_MTREV_MASK);
 
        /*
         * We found it.  Wake the chip up, and initialise.