From patchwork Wed Feb 13 12:22:24 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Porcedda X-Patchwork-Id: 2135781 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork2.kernel.org (Postfix) with ESMTP id BBF4DDFE75 for ; Wed, 13 Feb 2013 12:25:41 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1U5bN2-0003D2-Ue; Wed, 13 Feb 2013 12:23:28 +0000 Received: from mail-ee0-f45.google.com ([74.125.83.45]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1U5bMN-00032T-Ec for linux-arm-kernel@lists.infradead.org; Wed, 13 Feb 2013 12:22:49 +0000 Received: by mail-ee0-f45.google.com with SMTP id b57so546627eek.4 for ; Wed, 13 Feb 2013 04:22:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=Dm0G5zY1TGs67N9hgjFIimMbV8slTjXJ06UyYSW/Fjc=; b=FYoDl4TnmzJ5AUDWRHm4Fzko/vEqM8FjxYwAVpGREnFjnF2+qEGTUJr4XepsNUjOLd pmdB5saf6naxb4BWb2Wum1bN06uc8e+kPQI6xFVJl5fz8LokS4flOLZ5NThzNeGvKNb6 fCUMIeYT5GWqgTHCXrfb+ir+1Jj3RjmPas4h/qdxBYwOaxjVvv7L72Rgr4rkkLTxp76R j2euiIV8nwtIyGbU/kJWAh1jIGDQtnSw/qdW8WBqIcFFTm24uPrP0e13bp8TqU4VcWtV rVgi57i0AUo9/mqgp9EHErXeqqdQEK5pFt+7gAuZXNzWG8visQARcHWPCMUEwrZ3O/17 an1Q== X-Received: by 10.14.183.67 with SMTP id p43mr74240599eem.10.1360758157559; Wed, 13 Feb 2013 04:22:37 -0800 (PST) Received: from ld2036.tmt.telital.com ([213.205.6.118]) by mx.google.com with ESMTPS id a1sm47561728eep.2.2013.02.13.04.22.35 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 13 Feb 2013 04:22:36 -0800 (PST) From: Fabio Porcedda To: Wim Van Sebroeck , linux-watchdog@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Nicolas Ferre , Jean-Christophe PLAGNIOL-VILLARD , Andrew Victor , Jason Cooper , Andrew Lunn , Ben Dooks , Kukjin Kim Subject: [PATCH v8 1/7] watchdog: core: add and use watchdog_is_valid_timeout function Date: Wed, 13 Feb 2013 13:22:24 +0100 Message-Id: <1360758150-23004-2-git-send-email-fabio.porcedda@gmail.com> X-Mailer: git-send-email 1.8.1.1 In-Reply-To: <1360758150-23004-1-git-send-email-fabio.porcedda@gmail.com> References: <1360758150-23004-1-git-send-email-fabio.porcedda@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130213_072247_701725_A9B44F75 X-CRM114-Status: GOOD ( 12.08 ) X-Spam-Score: 0.3 (/) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (0.3 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [74.125.83.45 listed in list.dnswl.org] 3.0 KHOP_BIG_TO_CC Sent to 10+ recipients instaed of Bcc or a list 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (fabio.porcedda[at]gmail.com) -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature Cc: devicetree-discuss@lists.ozlabs.org, Wenyou Yang X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org Signed-off-by: Fabio Porcedda --- drivers/watchdog/watchdog_core.c | 14 ++++++++++++++ drivers/watchdog/watchdog_dev.c | 3 +-- include/linux/watchdog.h | 2 ++ 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/drivers/watchdog/watchdog_core.c b/drivers/watchdog/watchdog_core.c index 3796434..f10fa31 100644 --- a/drivers/watchdog/watchdog_core.c +++ b/drivers/watchdog/watchdog_core.c @@ -43,6 +43,20 @@ static DEFINE_IDA(watchdog_ida); static struct class *watchdog_class; /** + * watchdog_is_valid_timeout() - check if the timeout is within a valid range + * @timeout: value to check + */ +bool watchdog_is_valid_timeout(struct watchdog_device *wdd, uint timeout) +{ + if (wdd->min_timeout < wdd->max_timeout) + return (wdd->min_timeout <= timeout) && + (timeout <= wdd->max_timeout); + else + return (timeout > 0); +} +EXPORT_SYMBOL_GPL(watchdog_is_valid_timeout); + +/** * watchdog_register_device() - register a watchdog device * @wdd: watchdog device * diff --git a/drivers/watchdog/watchdog_dev.c b/drivers/watchdog/watchdog_dev.c index ef8edec..49976f8 100644 --- a/drivers/watchdog/watchdog_dev.c +++ b/drivers/watchdog/watchdog_dev.c @@ -200,8 +200,7 @@ static int watchdog_set_timeout(struct watchdog_device *wddev, !(wddev->info->options & WDIOF_SETTIMEOUT)) return -EOPNOTSUPP; - if ((wddev->max_timeout != 0) && - (timeout < wddev->min_timeout || timeout > wddev->max_timeout)) + if (!watchdog_is_valid_timeout(wddev, timeout)) return -EINVAL; mutex_lock(&wddev->lock); diff --git a/include/linux/watchdog.h b/include/linux/watchdog.h index 3a9df2f..9ae945e 100644 --- a/include/linux/watchdog.h +++ b/include/linux/watchdog.h @@ -130,6 +130,8 @@ static inline void *watchdog_get_drvdata(struct watchdog_device *wdd) } /* drivers/watchdog/watchdog_core.c */ +extern bool watchdog_is_valid_timeout(struct watchdog_device *wdd, + uint timeout); extern int watchdog_register_device(struct watchdog_device *); extern void watchdog_unregister_device(struct watchdog_device *);