Merge tag 'tty-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty

Pull tty/serial driver updates from Greg KH:
 "Here's the big tty/serial driver update for 3.19-rc1.

  There are a number of TTY core changes/fixes in here from Peter Hurley
  that have all been teted in linux-next for a long time now.  There are
  also the normal serial driver updates as well, full details in the
  changelog below"

* tag 'tty-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: (219 commits)
  serial: pxa: hold port.lock when reporting modem line changes
  tty-hvsi_lib: Deletion of an unnecessary check before the function call "tty_kref_put"
  tty: Deletion of unnecessary checks before two function calls
  n_tty: Fix read_buf race condition, increment read_head after pushing data
  serial: of-serial: add PM suspend/resume support
  Revert "serial: of-serial: add PM suspend/resume support"
  Revert "serial: of-serial: fix up PM ops on no_console_suspend and port type"
  serial: 8250: don't attempt a trylock if in sysrq
  serial: core: Add big-endian iotype
  serial: samsung: use port->fifosize instead of hardcoded values
  serial: samsung: prefer to use fifosize from driver data
  serial: samsung: fix style problems
  serial: samsung: wait for transfer completion before clock disable
  serial: icom: fix error return code
  serial: tegra: clean up tty-flag assignments
  serial: Fix io address assign flow with Fintek PCI-to-UART Product
  serial: mxs-auart: fix tx_empty against shift register
  serial: mxs-auart: fix gpio change detection on interrupt
  serial: mxs-auart: Fix mxs_auart_set_ldisc()
  serial: 8250_dw: Use 64-bit access for OCTEON.
  ...

1 files changed, 7 insertions, 7 deletions

diff --git a/drivers/tty/isicom.c b/drivers/tty/isicom.c
index 858291ca889c..59ed783c4bcd 100644
--- 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;