aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarco Felsch <m.felsch@pengutronix.de>2018-06-04 11:00:58 -0400
committerWim Van Sebroeck <wim@linux-watchdog.org>2018-06-07 06:41:42 -0400
commit6f4cedb7b4c35473f8f600cc09fa084185803265 (patch)
treebdcfa950a86a018c563b716eff33974a03e55292
parentf587e478b50344e8ae9bc0b1aa6f14242c23d050 (diff)
watchdog: da9063: rename helper function to avoid misunderstandings
_da9063_wdt_set_timeout() is called by da9063_wdg_set_timeout(), da9063_wdg_start() and da9063_wdg_probe() but the name expect only to be called by da9063_wdg_set_timeout(). Rename the function to avoid misunderstandings. 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.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/watchdog/da9063_wdt.c b/drivers/watchdog/da9063_wdt.c
index a4380a887e85..760aa9bca81b 100644
--- a/drivers/watchdog/da9063_wdt.c
+++ b/drivers/watchdog/da9063_wdt.c
@@ -64,7 +64,7 @@ static int da9063_wdt_disable_timer(struct da9063 *da9063)
64 DA9063_TWDSCALE_DISABLE); 64 DA9063_TWDSCALE_DISABLE);
65} 65}
66 66
67static int _da9063_wdt_set_timeout(struct da9063 *da9063, unsigned int regval) 67static int da9063_wdt_update_timeout(struct da9063 *da9063, unsigned int regval)
68{ 68{
69 int ret; 69 int ret;
70 70
@@ -93,7 +93,7 @@ static int da9063_wdt_start(struct watchdog_device *wdd)
93 int ret; 93 int ret;
94 94
95 selector = da9063_wdt_timeout_to_sel(wdd->timeout); 95 selector = da9063_wdt_timeout_to_sel(wdd->timeout);
96 ret = _da9063_wdt_set_timeout(da9063, selector); 96 ret = da9063_wdt_update_timeout(da9063, selector);
97 if (ret) 97 if (ret)
98 dev_err(da9063->dev, "Watchdog failed to start (err = %d)\n", 98 dev_err(da9063->dev, "Watchdog failed to start (err = %d)\n",
99 ret); 99 ret);
@@ -148,7 +148,7 @@ static int da9063_wdt_set_timeout(struct watchdog_device *wdd,
148 * enabling the watchdog, so the timeout must be buffered by the driver. 148 * enabling the watchdog, so the timeout must be buffered by the driver.
149 */ 149 */
150 if (watchdog_active(wdd)) 150 if (watchdog_active(wdd))
151 ret = _da9063_wdt_set_timeout(da9063, selector); 151 ret = da9063_wdt_update_timeout(da9063, selector);
152 152
153 if (ret) 153 if (ret)
154 dev_err(da9063->dev, "Failed to set watchdog timeout (err = %d)\n", 154 dev_err(da9063->dev, "Failed to set watchdog timeout (err = %d)\n",
@@ -223,7 +223,7 @@ static int da9063_wdt_probe(struct platform_device *pdev)
223 unsigned int timeout; 223 unsigned int timeout;
224 224
225 timeout = da9063_wdt_timeout_to_sel(DA9063_WDG_TIMEOUT); 225 timeout = da9063_wdt_timeout_to_sel(DA9063_WDG_TIMEOUT);
226 _da9063_wdt_set_timeout(da9063, timeout); 226 da9063_wdt_update_timeout(da9063, timeout);
227 set_bit(WDOG_HW_RUNNING, &wdd->status); 227 set_bit(WDOG_HW_RUNNING, &wdd->status);
228 } 228 }
229 229