[PATCH v4 1/2] serial: 8250_dw: make dw8250_set_termios as default set_termios callback

[Kefeng Wang]

Make dw8250_set_termios() handle all cases of dw8250_data->clk properly,
then we can safely use dw8250_set_termios() as the default set_termios
callback instead of serial8250_do_set_termios(), so do it.

Signed-off-by: Kefeng Wang <wangkefeng.w...@huawei.com>
---
 drivers/tty/serial/8250/8250_dw.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/tty/serial/8250/8250_dw.c 
b/drivers/tty/serial/8250/8250_dw.c
index 5c0c123..adecece 100644
--- a/drivers/tty/serial/8250/8250_dw.c
+++ b/drivers/tty/serial/8250/8250_dw.c
@@ -235,7 +235,7 @@ static void dw8250_set_termios(struct uart_port *p, struct 
ktermios *termios,
        unsigned int rate;
        int ret;
 
-       if (IS_ERR(d->clk) || !old)
+       if (IS_ERR_OR_NULL(d->clk) || !old)
                goto out;
 
        clk_disable_unprepare(d->clk);
@@ -308,13 +308,11 @@ static void dw8250_quirks(struct uart_port *p, struct 
dw8250_data *data)
                        p->serial_in = dw8250_serial_in32;
                        data->uart_16550_compatible = true;
                }
-               p->set_termios = dw8250_set_termios;
        }
 
        /* Platforms with iDMA */
        if (platform_get_resource_byname(to_platform_device(p->dev),
                                         IORESOURCE_MEM, "lpss_priv")) {
-               p->set_termios = dw8250_set_termios;
                data->dma.rx_param = p->dev->parent;
                data->dma.tx_param = p->dev->parent;
                data->dma.fn = dw8250_idma_filter;
@@ -391,6 +389,7 @@ static int dw8250_probe(struct platform_device *pdev)
        p->iotype       = UPIO_MEM;
        p->serial_in    = dw8250_serial_in;
        p->serial_out   = dw8250_serial_out;
+       p->set_termios  = dw8250_set_termios;
 
        p->membase = devm_ioremap(&pdev->dev, regs->start, resource_size(regs));
        if (!p->membase)
-- 
1.7.12.4