diff options
| author | Marco Felsch <m.felsch@pengutronix.de> | 2018-06-04 17:00:59 +0200 |
|---|---|---|
| committer | Wim Van Sebroeck <wim@linux-watchdog.org> | 2018-06-07 12:41:43 +0200 |
| commit | 16a7eec2fcd020c73cf0ca38bf774775167d22eb (patch) | |
| tree | f56c361e1a111e51aff2d10f2a9be4cc60f86be4 | |
| parent | 6f4cedb7b4c35473f8f600cc09fa084185803265 (diff) | |
| download | linux-16a7eec2fcd020c73cf0ca38bf774775167d22eb.tar.gz linux-16a7eec2fcd020c73cf0ca38bf774775167d22eb.tar.bz2 linux-16a7eec2fcd020c73cf0ca38bf774775167d22eb.zip | |
watchdog: da9063: remove duplicated timeout_to_sel calls
Every time da9063_wdt_update_timeout() gets called a timeout_to_sel() is
made because the timeout argument of update_timeout() is the raw
register value. Moving the second<->raw-value translation into
da9063_wdt_update_timeout() removes duplicated code.
Signed-off-by: Marco Felsch <m.felsch@pengutronix.de>
Acked-by: Steve Twiss <stwiss.opensource@diasemi.com>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Wim Van Sebroeck <wim@linux-watchdog.org>
| -rw-r--r-- | drivers/watchdog/da9063_wdt.c | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/drivers/watchdog/da9063_wdt.c b/drivers/watchdog/da9063_wdt.c index 760aa9bca81b..384dca16af8b 100644 --- a/drivers/watchdog/da9063_wdt.c +++ b/drivers/watchdog/da9063_wdt.c @@ -64,8 +64,10 @@ static int da9063_wdt_disable_timer(struct da9063 *da9063) DA9063_TWDSCALE_DISABLE); } -static int da9063_wdt_update_timeout(struct da9063 *da9063, unsigned int regval) +static int +da9063_wdt_update_timeout(struct da9063 *da9063, unsigned int timeout) { + unsigned int regval; int ret; /* @@ -81,6 +83,7 @@ static int da9063_wdt_update_timeout(struct da9063 *da9063, unsigned int regval) return ret; usleep_range(150, 300); + regval = da9063_wdt_timeout_to_sel(timeout); return regmap_update_bits(da9063->regmap, DA9063_REG_CONTROL_D, DA9063_TWDSCALE_MASK, regval); @@ -89,11 +92,9 @@ static int da9063_wdt_update_timeout(struct da9063 *da9063, unsigned int regval) static int da9063_wdt_start(struct watchdog_device *wdd) { struct da9063 *da9063 = watchdog_get_drvdata(wdd); - unsigned int selector; int ret; - selector = da9063_wdt_timeout_to_sel(wdd->timeout); - ret = da9063_wdt_update_timeout(da9063, selector); + ret = da9063_wdt_update_timeout(da9063, wdd->timeout); if (ret) dev_err(da9063->dev, "Watchdog failed to start (err = %d)\n", ret); @@ -132,11 +133,8 @@ static int da9063_wdt_set_timeout(struct watchdog_device *wdd, unsigned int timeout) { struct da9063 *da9063 = watchdog_get_drvdata(wdd); - unsigned int selector; int ret = 0; - selector = da9063_wdt_timeout_to_sel(timeout); - /* * There are two cases when a set_timeout() will be called: * 1. The watchdog is off and someone wants to set the timeout for the @@ -148,13 +146,13 @@ static int da9063_wdt_set_timeout(struct watchdog_device *wdd, * enabling the watchdog, so the timeout must be buffered by the driver. */ if (watchdog_active(wdd)) - ret = da9063_wdt_update_timeout(da9063, selector); + ret = da9063_wdt_update_timeout(da9063, timeout); if (ret) dev_err(da9063->dev, "Failed to set watchdog timeout (err = %d)\n", ret); else - wdd->timeout = wdt_timeout[selector]; + wdd->timeout = wdt_timeout[da9063_wdt_timeout_to_sel(timeout)]; return ret; } @@ -220,10 +218,7 @@ static int da9063_wdt_probe(struct platform_device *pdev) /* Change the timeout to the default value if the watchdog is running */ if (da9063_wdt_is_running(da9063)) { - unsigned int timeout; - - timeout = da9063_wdt_timeout_to_sel(DA9063_WDG_TIMEOUT); - da9063_wdt_update_timeout(da9063, timeout); + da9063_wdt_update_timeout(da9063, DA9063_WDG_TIMEOUT); set_bit(WDOG_HW_RUNNING, &wdd->status); } |