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

[cascardo/linux.git] / drivers / tty / isicom.c

diff --git a/drivers/tty/isicom.c b/drivers/tty/isicom.c
index 858291c..59ed783 100644 (file)
--- a/drivers/tty/isicom.c
+++ b/drivers/tty/isicom.c
@@ -249,7 +249,7 @@ static int lock_card(struct isi_board *card)
                spin_unlock_irqrestore(&card->card_lock, card->flags);
                msleep(10);
        }
-       pr_warning("Failed to lock Card (0x%lx)\n", card->base);
+       pr_warn("Failed to lock Card (0x%lx)\n", card->base);
 
        return 0;       /* Failed to acquire the card! */
 }
@@ -378,13 +378,13 @@ static inline int __isicom_paranoia_check(struct isi_port const *port,
        char *name, const char *routine)
 {
        if (!port) {
-               pr_warning("Warning: bad isicom magic for dev %s in %s.\n",
-                          name, routine);
+               pr_warn("Warning: bad isicom magic for dev %s in %s\n",
+                       name, routine);
                return 1;
        }
        if (port->magic != ISICOM_MAGIC) {
-               pr_warning("Warning: NULL isicom port for dev %s in %s.\n",
-                          name, routine);
+               pr_warn("Warning: NULL isicom port for dev %s in %s\n",
+                       name, routine);
                return 1;
        }
 
@@ -546,8 +546,8 @@ static irqreturn_t isicom_interrupt(int irq, void *dev_id)
        byte_count = header & 0xff;
 
        if (channel + 1 > card->port_count) {
-               pr_warning("%s(0x%lx): %d(channel) > port_count.\n",
-                          __func__, base, channel+1);
+               pr_warn("%s(0x%lx): %d(channel) > port_count\n",
+                       __func__, base, channel + 1);
                outw(0x0000, base+0x04); /* enable interrupts */
                spin_unlock(&card->card_lock);
                return IRQ_HANDLED;