4 files changed, 24 insertions, 18 deletions

diff --git a/drivers/serial/atmel_serial.c b/drivers/serial/atmel_serial.c
index b3497d7e5354..338b15c0a548 100644
--- a/drivers/serial/atmel_serial.c
+++ b/drivers/serial/atmel_serial.c
@@ -1104,11 +1104,13 @@ static void atmel_set_termios(struct uart_port *port, struct ktermios *termios,
         /* update the per-port timeout */
         uart_update_timeout(port, termios->c_cflag, baud);
 
-        /* save/disable interrupts and drain transmitter */
+        /*
+         * save/disable interrupts. The tty layer will ensure that the
+         * transmitter is empty if requested by the caller, so there's
+         * no need to wait for it here.
+         */
         imr = UART_GET_IMR(port);
         UART_PUT_IDR(port, -1);
-        while (!(UART_GET_CSR(port) & ATMEL_US_TXEMPTY))
-                cpu_relax();
 
         /* disable receiver and transmitter */
         UART_PUT_CR(port, ATMEL_US_TXDIS | ATMEL_US_RXDIS);
diff --git a/drivers/serial/imx.c b/drivers/serial/imx.c
index 285b414f3054..5d7b58f1fe42 100644
--- a/drivers/serial/imx.c
+++ b/drivers/serial/imx.c
@@ -924,11 +924,13 @@ imx_set_termios(struct uart_port *port, struct ktermios *termios,
         rational_best_approximation(16 * div * baud, sport->port.uartclk,
                 1 << 16, 1 << 16, &num, &denom);
 
-        tdiv64 = sport->port.uartclk;
-        tdiv64 *= num;
-        do_div(tdiv64, denom * 16 * div);
-        tty_encode_baud_rate(sport->port.info->port.tty,
-                (speed_t)tdiv64, (speed_t)tdiv64);
+        if (port->info && port->info->port.tty) {
+                tdiv64 = sport->port.uartclk;
+                tdiv64 *= num;
+                do_div(tdiv64, denom * 16 * div);
+                tty_encode_baud_rate(sport->port.info->port.tty,
+                                (speed_t)tdiv64, (speed_t)tdiv64);
+        }
 
         num -= 1;
         denom -= 1;
diff --git a/drivers/serial/of_serial.c b/drivers/serial/of_serial.c
index 14f8fa9135be..54483cd3529e 100644
--- a/drivers/serial/of_serial.c
+++ b/drivers/serial/of_serial.c
@@ -122,7 +122,7 @@ static int __devinit of_platform_serial_probe(struct of_device *ofdev,
 
         info->type = port_type;
         info->line = ret;
-        ofdev->dev.driver_data = info;
+        dev_set_drvdata(&ofdev->dev, info);
         return 0;
 out:
         kfree(info);
@@ -135,7 +135,7 @@ out:
  */
 static int of_platform_serial_remove(struct of_device *ofdev)
 {
-        struct of_serial_info *info = ofdev->dev.driver_data;
+        struct of_serial_info *info = dev_get_drvdata(&ofdev->dev);
         switch (info->type) {
 #ifdef CONFIG_SERIAL_8250
         case PORT_8250 ... PORT_MAX_8250:
diff --git a/drivers/serial/sh-sci.c b/drivers/serial/sh-sci.c
index a4cf1079b312..66f52674ca0c 100644
--- a/drivers/serial/sh-sci.c
+++ b/drivers/serial/sh-sci.c
@@ -1332,44 +1332,46 @@ err_unreg:
         return ret;
 }
 
-static int sci_suspend(struct platform_device *dev, pm_message_t state)
+static int sci_suspend(struct device *dev)
 {
-        struct sh_sci_priv *priv = platform_get_drvdata(dev);
+        struct sh_sci_priv *priv = dev_get_drvdata(dev);
         struct sci_port *p;
         unsigned long flags;
 
         spin_lock_irqsave(&priv->lock, flags);
         list_for_each_entry(p, &priv->ports, node)
                 uart_suspend_port(&sci_uart_driver, &p->port);
-
         spin_unlock_irqrestore(&priv->lock, flags);
 
         return 0;
 }
 
-static int sci_resume(struct platform_device *dev)
+static int sci_resume(struct device *dev)
 {
-        struct sh_sci_priv *priv = platform_get_drvdata(dev);
+        struct sh_sci_priv *priv = dev_get_drvdata(dev);
         struct sci_port *p;
         unsigned long flags;
 
         spin_lock_irqsave(&priv->lock, flags);
         list_for_each_entry(p, &priv->ports, node)
                 uart_resume_port(&sci_uart_driver, &p->port);
-
         spin_unlock_irqrestore(&priv->lock, flags);
 
         return 0;
 }
 
+static struct dev_pm_ops sci_dev_pm_ops = {
+        .suspend        = sci_suspend,
+        .resume         = sci_resume,
+};
+
 static struct platform_driver sci_driver = {
         .probe          = sci_probe,
         .remove         = __devexit_p(sci_remove),
-        .suspend        = sci_suspend,
-        .resume         = sci_resume,
         .driver         = {
                 .name   = "sh-sci",
                 .owner  = THIS_MODULE,
+                .pm     = &sci_dev_pm_ops,
         },
 };