diff options
Diffstat (limited to '')
| -rw-r--r-- | drivers/tty/serial/sc16is7xx.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/tty/serial/sc16is7xx.c b/drivers/tty/serial/sc16is7xx.c index 1b6a77c4b2cb..3284c31085a7 100644 --- a/drivers/tty/serial/sc16is7xx.c +++ b/drivers/tty/serial/sc16is7xx.c @@ -991,7 +991,6 @@ static const struct uart_ops sc16is7xx_ops = { .stop_tx = sc16is7xx_stop_tx, .start_tx = sc16is7xx_start_tx, .stop_rx = sc16is7xx_stop_rx, - .enable_ms = sc16is7xx_null_void, .break_ctl = sc16is7xx_break_ctl, .startup = sc16is7xx_startup, .shutdown = sc16is7xx_shutdown, @@ -1061,7 +1060,6 @@ static int sc16is7xx_probe(struct device *dev, struct regmap *regmap, int irq, unsigned long flags) { unsigned long freq, *pfreq = dev_get_platdata(dev); - struct clk *clk; int i, ret; struct sc16is7xx_port *s; @@ -1077,14 +1075,14 @@ static int sc16is7xx_probe(struct device *dev, return -ENOMEM; } - clk = devm_clk_get(dev, NULL); - if (IS_ERR(clk)) { + s->clk = devm_clk_get(dev, NULL); + if (IS_ERR(s->clk)) { if (pfreq) freq = *pfreq; else - return PTR_ERR(clk); + return PTR_ERR(s->clk); } else { - freq = clk_get_rate(clk); + freq = clk_get_rate(s->clk); } s->regmap = regmap; |