1 files changed, 23 insertions, 27 deletions

diff --git a/drivers/tty/serial/xilinx_uartps.c b/drivers/tty/serial/xilinx_uartps.c
index 9ab910370c56..ba451c7209fc 100644
--- a/drivers/tty/serial/xilinx_uartps.c
+++ b/drivers/tty/serial/xilinx_uartps.c
@@ -17,6 +17,7 @@
 #include <linux/tty.h>
 #include <linux/tty_flip.h>
 #include <linux/console.h>
+#include <linux/clk.h>
 #include <linux/irq.h>
 #include <linux/io.h>
 #include <linux/of.h>
@@ -147,15 +148,11 @@
 static irqreturn_t xuartps_isr(int irq, void *dev_id)
 {
         struct uart_port *port = (struct uart_port *)dev_id;
-        struct tty_struct *tty;
         unsigned long flags;
         unsigned int isrstatus, numbytes;
         unsigned int data;
         char status = TTY_NORMAL;
 
-        /* Get the tty which could be NULL so don't assume it's valid */
-        tty = tty_port_tty_get(&port->state->port);
-
         spin_lock_irqsave(&port->lock, flags);
 
         /* Read the interrupt status register to determine which
@@ -187,14 +184,11 @@ static irqreturn_t xuartps_isr(int irq, void *dev_id)
                         } else if (isrstatus & XUARTPS_IXR_OVERRUN)
                                 port->icount.overrun++;
 
-                        if (tty)
-                                uart_insert_char(port, isrstatus,
-                                                XUARTPS_IXR_OVERRUN, data,
-                                                status);
+                        uart_insert_char(port, isrstatus, XUARTPS_IXR_OVERRUN,
+                                        data, status);
                 }
                 spin_unlock(&port->lock);
-                if (tty)
-                        tty_flip_buffer_push(tty);
+                tty_flip_buffer_push(&port->state->port);
                 spin_lock(&port->lock);
         }
 
@@ -237,7 +231,6 @@ static irqreturn_t xuartps_isr(int irq, void *dev_id)
 
         /* be sure to release the lock and tty before leaving */
         spin_unlock_irqrestore(&port->lock, flags);
-        tty_kref_put(tty);
 
         return IRQ_HANDLED;
 }
@@ -944,16 +937,18 @@ static int xuartps_probe(struct platform_device *pdev)
         int rc;
         struct uart_port *port;
         struct resource *res, *res2;
-        int clk = 0;
-
-        const unsigned int *prop;
+        struct clk *clk;
 
-        prop = of_get_property(pdev->dev.of_node, "clock", NULL);
-        if (prop)
-                clk = be32_to_cpup(prop);
-        if (!clk) {
+        clk = of_clk_get(pdev->dev.of_node, 0);
+        if (IS_ERR(clk)) {
                 dev_err(&pdev->dev, "no clock specified\n");
-                return -ENODEV;
+                return PTR_ERR(clk);
+        }
+
+        rc = clk_prepare_enable(clk);
+        if (rc) {
+                dev_err(&pdev->dev, "could not enable clock\n");
+                return -EBUSY;
         }
 
         res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
@@ -978,7 +973,8 @@ static int xuartps_probe(struct platform_device *pdev)
                 port->mapbase = res->start;
                 port->irq = res2->start;
                 port->dev = &pdev->dev;
-                port->uartclk = clk;
+                port->uartclk = clk_get_rate(clk);
+                port->private_data = clk;
                 dev_set_drvdata(&pdev->dev, port);
                 rc = uart_add_one_port(&xuartps_uart_driver, port);
                 if (rc) {
@@ -1000,14 +996,14 @@ static int xuartps_probe(struct platform_device *pdev)
 static int xuartps_remove(struct platform_device *pdev)
 {
         struct uart_port *port = dev_get_drvdata(&pdev->dev);
-        int rc = 0;
+        struct clk *clk = port->private_data;
+        int rc;
 
         /* Remove the xuartps port from the serial core */
-        if (port) {
-                rc = uart_remove_one_port(&xuartps_uart_driver, port);
-                dev_set_drvdata(&pdev->dev, NULL);
-                port->mapbase = 0;
-        }
+        rc = uart_remove_one_port(&xuartps_uart_driver, port);
+        dev_set_drvdata(&pdev->dev, NULL);
+        port->mapbase = 0;
+        clk_disable_unprepare(clk);
         return rc;
 }
 
@@ -1048,7 +1044,7 @@ MODULE_DEVICE_TABLE(of, xuartps_of_match);
 
 static struct platform_driver xuartps_platform_driver = {
         .probe   = xuartps_probe,               /* Probe method */
-        .remove  = __exit_p(xuartps_remove),    /* Detach method */
+        .remove  = xuartps_remove,              /* Detach method */
         .suspend = xuartps_suspend,             /* Suspend */
         .resume  = xuartps_resume,              /* Resume after a suspend */
         .driver  = {