]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
serial: lantiq: Replace clk_enable/clk_disable with clk generic API
authorSongjun Wu <songjun.wu@linux.intel.com>
Tue, 16 Oct 2018 09:19:09 +0000 (17:19 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 9 Nov 2018 16:43:27 +0000 (08:43 -0800)
The clk driver has introduced new clock APIs that replace
the existing clk_enable and clk_disable.
- clk_enable() APIs is replaced with clk_prepare_enable()
- clk_disable() API is replaced with clk_disable_unprepare()

Signed-off-by: Songjun Wu <songjun.wu@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/tty/serial/lantiq.c

index 4acdbdf8fe7a72fcc48f8e3f368e82b4452a58bb..34b1ef3c12ced22cfc0cdd1a92ce05ea176659e4 100644 (file)
@@ -308,7 +308,7 @@ lqasc_startup(struct uart_port *port)
        int retval;
 
        if (!IS_ERR(ltq_port->clk))
-               clk_enable(ltq_port->clk);
+               clk_prepare_enable(ltq_port->clk);
        port->uartclk = clk_get_rate(ltq_port->freqclk);
 
        asc_update_bits(ASCCLC_DISS | ASCCLC_RMCMASK, (1 << ASCCLC_RMCOFFSET),
@@ -376,7 +376,7 @@ lqasc_shutdown(struct uart_port *port)
        asc_update_bits(ASCTXFCON_TXFEN, ASCTXFCON_TXFFLU,
                port->membase + LTQ_ASC_TXFCON);
        if (!IS_ERR(ltq_port->clk))
-               clk_disable(ltq_port->clk);
+               clk_disable_unprepare(ltq_port->clk);
 }
 
 static void
@@ -630,7 +630,7 @@ lqasc_console_setup(struct console *co, char *options)
        port = &ltq_port->port;
 
        if (!IS_ERR(ltq_port->clk))
-               clk_enable(ltq_port->clk);
+               clk_prepare_enable(ltq_port->clk);
 
        port->uartclk = clk_get_rate(ltq_port->freqclk);