From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934662AbdEVORs (ORCPT ); Mon, 22 May 2017 10:17:48 -0400 Received: from mail01.prevas.se ([62.95.78.3]:53000 "EHLO mail01.prevas.se" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934407AbdEVORe (ORCPT ); Mon, 22 May 2017 10:17:34 -0400 X-Greylist: delayed 642 seconds by postgrey-1.27 at vger.kernel.org; Mon, 22 May 2017 10:17:34 EDT X-IronPort-AV: E=Sophos;i="5.38,377,1491256800"; d="scan'208";a="2242128" From: Rasmus Villemoes To: Wim Van Sebroeck , Guenter Roeck CC: Sebastian Reichel , , Rasmus Villemoes , , Subject: [PATCH v5 1/3] watchdog: introduce watchdog_worker_should_ping helper Date: Mon, 22 May 2017 16:06:37 +0200 Message-ID: <1495462000-28979-2-git-send-email-rasmus.villemoes@prevas.dk> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1495462000-28979-1-git-send-email-rasmus.villemoes@prevas.dk> References: <1495462000-28979-1-git-send-email-rasmus.villemoes@prevas.dk> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [172.16.8.31] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This will be useful when the condition becomes slightly more complicated in the next patch. Signed-off-by: Rasmus Villemoes --- drivers/watchdog/watchdog_dev.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/drivers/watchdog/watchdog_dev.c b/drivers/watchdog/watchdog_dev.c index d5d2bbd..caa4b90 100644 --- a/drivers/watchdog/watchdog_dev.c +++ b/drivers/watchdog/watchdog_dev.c @@ -192,18 +192,23 @@ static int watchdog_ping(struct watchdog_device *wdd) return __watchdog_ping(wdd); } +static bool watchdog_worker_should_ping(struct watchdog_core_data *wd_data) +{ + struct watchdog_device *wdd = wd_data->wdd; + + return wdd && (watchdog_active(wdd) || watchdog_hw_running(wdd)); +} + static void watchdog_ping_work(struct work_struct *work) { struct watchdog_core_data *wd_data; - struct watchdog_device *wdd; wd_data = container_of(to_delayed_work(work), struct watchdog_core_data, work); mutex_lock(&wd_data->lock); - wdd = wd_data->wdd; - if (wdd && (watchdog_active(wdd) || watchdog_hw_running(wdd))) - __watchdog_ping(wdd); + if (watchdog_worker_should_ping(wd_data)) + __watchdog_ping(wd_data->wdd); mutex_unlock(&wd_data->lock); } -- 2.7.4