From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752869AbbK2T3P (ORCPT ); Sun, 29 Nov 2015 14:29:15 -0500 Received: from bh-25.webhostbox.net ([208.91.199.152]:52956 "EHLO bh-25.webhostbox.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752440AbbK2T3C (ORCPT ); Sun, 29 Nov 2015 14:29:02 -0500 From: Guenter Roeck To: linux-watchdog@vger.kernel.org Cc: Wim Van Sebroeck , linux-kernel@vger.kernel.org, Timo Kokkonen , =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= , linux-doc@vger.kernel.org, Doug Anderson , Jonathan Corbet , Guenter Roeck Subject: [PATCH v6 5/9] watchdog: Simplify update_worker Date: Sun, 29 Nov 2015 11:28:47 -0800 Message-Id: <1448825331-28840-6-git-send-email-linux@roeck-us.net> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1448825331-28840-1-git-send-email-linux@roeck-us.net> References: <1448825331-28840-1-git-send-email-linux@roeck-us.net> X-Authenticated_sender: guenter@roeck-us.net X-OutGoing-Spam-Status: No, score=-1.0 X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - bh-25.webhostbox.net X-AntiAbuse: Original Domain - vger.kernel.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - roeck-us.net X-Get-Message-Sender-Via: bh-25.webhostbox.net: authenticated_id: guenter@roeck-us.net X-Source: X-Source-Args: X-Source-Dir: Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Drop 'cancel' parameter; simply cancel worker unconditionally if not needed. Signed-off-by: Guenter Roeck --- v6: Rebased to v4.4-rc2 v5: Introduced patch --- drivers/watchdog/watchdog_dev.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/drivers/watchdog/watchdog_dev.c b/drivers/watchdog/watchdog_dev.c index 82706d43e0c8..be65b388e277 100644 --- a/drivers/watchdog/watchdog_dev.c +++ b/drivers/watchdog/watchdog_dev.c @@ -96,15 +96,14 @@ static long watchdog_next_keepalive(struct watchdog_device *wdd) return min_t(long, last_heartbeat - jiffies, keepalive_interval); } -static inline void watchdog_update_worker(struct watchdog_device *wdd, - bool cancel) +static inline void watchdog_update_worker(struct watchdog_device *wdd) { if (watchdog_need_worker(wdd)) { long t = watchdog_next_keepalive(wdd); if (t > 0) mod_delayed_work(watchdog_wq, &wdd->work, t); - } else if (cancel) { + } else { cancel_delayed_work(&wdd->work); } } @@ -133,7 +132,7 @@ static int _watchdog_ping(struct watchdog_device *wdd) else err = wdd->ops->start(wdd); /* restart watchdog */ - watchdog_update_worker(wdd, false); + watchdog_update_worker(wdd); return err; } @@ -200,7 +199,7 @@ static int watchdog_start(struct watchdog_device *wdd) if (err == 0) { set_bit(WDOG_ACTIVE, &wdd->status); wdd->last_keepalive = started_at; - watchdog_update_worker(wdd, true); + watchdog_update_worker(wdd); } out_start: @@ -245,7 +244,7 @@ static int watchdog_stop(struct watchdog_device *wdd) if (err == 0) { clear_bit(WDOG_ACTIVE, &wdd->status); - watchdog_update_worker(wdd, true); + watchdog_update_worker(wdd); } out_stop: @@ -313,7 +312,7 @@ static int watchdog_set_timeout(struct watchdog_device *wdd, else wdd->timeout = timeout; - watchdog_update_worker(wdd, true); + watchdog_update_worker(wdd); out_timeout: mutex_unlock(&wdd->lock); @@ -592,7 +591,7 @@ static int watchdog_release(struct inode *inode, struct file *file) } cancel_delayed_work_sync(&wdd->work); - watchdog_update_worker(wdd, false); + watchdog_update_worker(wdd); /* * Allow the owner module to be unloaded again unless the watchdog -- 2.1.4