android/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

serial: max310x: Use devm_clk_get_optional() to get the input clock

Browse Source 
[ Upstream commit 974e454d6f96da0c0ab1b4115b92587dd9406f6a ]

Simplify the code which fetches the input clock by using
devm_clk_get_optional(). If no input clock is present
devm_clk_get_optional() will return NULL instead of an error
which matches the behavior of the old code.

Signed-off-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Link: https://lore.kernel.org/r/20201007084635.594991-2-andy.shevchenko@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Stable-dep-of: 8afa6c6decea ("serial: max310x: fail probe if clock crystal is unstable")
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Andy Shevchenko 2020-10-07 11:46:35 +03:00 committed by Sasha Levin
parent 696e4112e5
commit 569154b29a
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
drivers/tty/serial/max310x.c
View File

@ -1265,7 +1265,6 @@ static int max310x_probe(struct device *dev, struct max310x_devtype *devtype,
struct regmap *regmap, int irq) struct regmap *regmap, int irq)
{ {
int i, ret, fmin, fmax, freq, uartclk; int i, ret, fmin, fmax, freq, uartclk;
struct clk *clk_osc, *clk_xtal;
struct max310x_port *s; struct max310x_port *s;
bool xtal = false; bool xtal = false;
@ -1279,23 +1278,24 @@ static int max310x_probe(struct device *dev, struct max310x_devtype *devtype,
return -ENOMEM; return -ENOMEM;
} }
clk_osc = devm_clk_get(dev, "osc"); s->clk = devm_clk_get_optional(dev, "osc");
clk_xtal = devm_clk_get(dev, "xtal"); if (IS_ERR(s->clk))
if (!IS_ERR(clk_osc)) { return PTR_ERR(s->clk);
s->clk = clk_osc; if (s->clk) {
fmin = 500000; fmin = 500000;
fmax = 35000000; fmax = 35000000;
} else if (!IS_ERR(clk_xtal)) {
s->clk = clk_xtal;
fmin = 1000000;
fmax = 4000000;
xtal = true;
} else if (PTR_ERR(clk_osc) == -EPROBE_DEFER ||
PTR_ERR(clk_xtal) == -EPROBE_DEFER) {
return -EPROBE_DEFER;
} else { } else {
dev_err(dev, "Cannot get clock\n"); s->clk = devm_clk_get_optional(dev, "xtal");
return -EINVAL; if (IS_ERR(s->clk))
return PTR_ERR(s->clk);
if (s->clk) {
fmin = 1000000;
fmax = 4000000;
xtal = true;
} else {
dev_err(dev, "Cannot get clock\n");
return -EINVAL;
}
} }
ret = clk_prepare_enable(s->clk); ret = clk_prepare_enable(s->clk);