| Message ID | 20190906205411.31666-3-jorge.ramirez-ortiz@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | [1/2] watchdog: qcom: support pre-timeout when the bark irq is available | expand |
On Fri, Sep 06, 2019 at 10:54:11PM +0200, Jorge Ramirez-Ortiz wrote: > there is no need to continue keeping the clock in private storage. > > Signed-off-by: Jorge Ramirez-Ortiz <jorge.ramirez-ortiz@linaro.org> Good catch. Reviewed-by: Guenter Roeck <linux@roeck-us.net> > --- > drivers/watchdog/qcom-wdt.c | 15 +++++++-------- > 1 file changed, 7 insertions(+), 8 deletions(-) > > diff --git a/drivers/watchdog/qcom-wdt.c b/drivers/watchdog/qcom-wdt.c > index 935c78a882a3..e98f5a3d83ea 100644 > --- a/drivers/watchdog/qcom-wdt.c > +++ b/drivers/watchdog/qcom-wdt.c > @@ -42,7 +42,6 @@ static const u32 reg_offset_data_kpss[] = { > > struct qcom_wdt { > struct watchdog_device wdd; > - struct clk *clk; > unsigned long rate; > void __iomem *base; > const u32 *layout; > @@ -189,6 +188,7 @@ static int qcom_wdt_probe(struct platform_device *pdev) > const u32 *regs; > u32 percpu_offset; > int irq, ret; > + struct clk *clk; > > regs = of_device_get_match_data(dev); > if (!regs) { > @@ -215,19 +215,18 @@ static int qcom_wdt_probe(struct platform_device *pdev) > if (IS_ERR(wdt->base)) > return PTR_ERR(wdt->base); > > - wdt->clk = devm_clk_get(dev, NULL); > - if (IS_ERR(wdt->clk)) { > + clk = devm_clk_get(dev, NULL); > + if (IS_ERR(clk)) { > dev_err(dev, "failed to get input clock\n"); > - return PTR_ERR(wdt->clk); > + return PTR_ERR(clk); > } > > - ret = clk_prepare_enable(wdt->clk); > + ret = clk_prepare_enable(clk); > if (ret) { > dev_err(dev, "failed to setup clock\n"); > return ret; > } > - ret = devm_add_action_or_reset(dev, qcom_clk_disable_unprepare, > - wdt->clk); > + ret = devm_add_action_or_reset(dev, qcom_clk_disable_unprepare, clk); > if (ret) > return ret; > > @@ -239,7 +238,7 @@ static int qcom_wdt_probe(struct platform_device *pdev) > * that it would bite before a second elapses it's usefulness is > * limited. Bail if this is the case. > */ > - wdt->rate = clk_get_rate(wdt->clk); > + wdt->rate = clk_get_rate(clk); > if (wdt->rate == 0 || > wdt->rate > 0x10000000U) { > dev_err(dev, "invalid clock rate\n");
diff --git a/drivers/watchdog/qcom-wdt.c b/drivers/watchdog/qcom-wdt.c index 935c78a882a3..e98f5a3d83ea 100644 --- a/drivers/watchdog/qcom-wdt.c +++ b/drivers/watchdog/qcom-wdt.c @@ -42,7 +42,6 @@ static const u32 reg_offset_data_kpss[] = { struct qcom_wdt { struct watchdog_device wdd; - struct clk *clk; unsigned long rate; void __iomem *base; const u32 *layout; @@ -189,6 +188,7 @@ static int qcom_wdt_probe(struct platform_device *pdev) const u32 *regs; u32 percpu_offset; int irq, ret; + struct clk *clk; regs = of_device_get_match_data(dev); if (!regs) { @@ -215,19 +215,18 @@ static int qcom_wdt_probe(struct platform_device *pdev) if (IS_ERR(wdt->base)) return PTR_ERR(wdt->base); - wdt->clk = devm_clk_get(dev, NULL); - if (IS_ERR(wdt->clk)) { + clk = devm_clk_get(dev, NULL); + if (IS_ERR(clk)) { dev_err(dev, "failed to get input clock\n"); - return PTR_ERR(wdt->clk); + return PTR_ERR(clk); } - ret = clk_prepare_enable(wdt->clk); + ret = clk_prepare_enable(clk); if (ret) { dev_err(dev, "failed to setup clock\n"); return ret; } - ret = devm_add_action_or_reset(dev, qcom_clk_disable_unprepare, - wdt->clk); + ret = devm_add_action_or_reset(dev, qcom_clk_disable_unprepare, clk); if (ret) return ret; @@ -239,7 +238,7 @@ static int qcom_wdt_probe(struct platform_device *pdev) * that it would bite before a second elapses it's usefulness is * limited. Bail if this is the case. */ - wdt->rate = clk_get_rate(wdt->clk); + wdt->rate = clk_get_rate(clk); if (wdt->rate == 0 || wdt->rate > 0x10000000U) { dev_err(dev, "invalid clock rate\n");
there is no need to continue keeping the clock in private storage. Signed-off-by: Jorge Ramirez-Ortiz <jorge.ramirez-ortiz@linaro.org> --- drivers/watchdog/qcom-wdt.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) -- 2.23.0