From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754097AbcLLJ16 (ORCPT ); Mon, 12 Dec 2016 04:27:58 -0500 Received: from mail01.prevas.se ([62.95.78.3]:56900 "EHLO mail01.prevas.se" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752708AbcLLJ14 (ORCPT ); Mon, 12 Dec 2016 04:27:56 -0500 X-Greylist: delayed 601 seconds by postgrey-1.27 at vger.kernel.org; Mon, 12 Dec 2016 04:27:56 EST X-IronPort-AV: E=Sophos;i="5.33,334,1477954800"; d="scan'208";a="1596111" From: Rasmus Villemoes To: Wim Van Sebroeck , Guenter Roeck CC: Rasmus Villemoes , , Subject: [PATCH v2 1/2] watchdog: introduce watchdog_worker_should_ping helper Date: Mon, 12 Dec 2016 10:17:52 +0100 Message-ID: <1481534273-7600-2-git-send-email-rasmus.villemoes@prevas.dk> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1481534273-7600-1-git-send-email-rasmus.villemoes@prevas.dk> References: <1468487788-22457-1-git-send-email-rasmus.villemoes@prevas.dk> <1481534273-7600-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 | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/watchdog/watchdog_dev.c b/drivers/watchdog/watchdog_dev.c index 32930a0..ca0a000 100644 --- a/drivers/watchdog/watchdog_dev.c +++ b/drivers/watchdog/watchdog_dev.c @@ -192,6 +192,11 @@ static int watchdog_ping(struct watchdog_device *wdd) return __watchdog_ping(wdd); } +static bool watchdog_worker_should_ping(struct watchdog_device *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; @@ -202,7 +207,7 @@ static void watchdog_ping_work(struct work_struct *work) mutex_lock(&wd_data->lock); wdd = wd_data->wdd; - if (wdd && (watchdog_active(wdd) || watchdog_hw_running(wdd))) + if (watchdog_worker_should_ping(wdd)) __watchdog_ping(wdd); mutex_unlock(&wd_data->lock); } -- 2.7.4