From patchwork Thu Feb 14 08:14:30 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Porcedda X-Patchwork-Id: 2140721 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork1.kernel.org (Postfix) with ESMTP id A7C343FCF6 for ; Thu, 14 Feb 2013 08:19:12 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1U5tzj-0005JJ-RJ; Thu, 14 Feb 2013 08:16:39 +0000 Received: from mail-ea0-f174.google.com ([209.85.215.174]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1U5ty3-0004MH-Bn for linux-arm-kernel@lists.infradead.org; Thu, 14 Feb 2013 08:14:56 +0000 Received: by mail-ea0-f174.google.com with SMTP id 1so758329eaa.33 for ; Thu, 14 Feb 2013 00:14:53 -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=2icMZ/STC6I15EeJpDguR0GnszsalI3mZynOx1uVDEQ=; b=BrwSFpMmXFdi8FnZ9C5n6/lmw2oybuMxDdbRzNe08Be94A8Br9hOQCDHaIQjOwy80T RVzXBNxfkGzyJj8xXw/aN9MLhAG8pcya5h3L96XcXomCoTBTfoDW6Kd48ThyscoRDBTn uIZYeyvqmbsQXmoZi1toULIduBcGhU/RAriTF5yY5LscASw3jdVPWcyrtfMXSqHPr/LS yfhEazL6/p5+4v22slATWWKh/yQyfKlh50hS8iD2tl4CpxXqhHJFMk94OwPbW2QrJyLd dnQVpSzqimZHdUzaEXPsGIH9pXFzg5GOf1JF9dXrQiGYOplBakOM37H+S/PTPkTGvdu+ zq/Q== X-Received: by 10.14.220.135 with SMTP id o7mr69938738eep.3.1360829693455; Thu, 14 Feb 2013 00:14:53 -0800 (PST) Received: from ld2036.tmt.telital.com ([213.205.6.118]) by mx.google.com with ESMTPS id f47sm31513859eep.13.2013.02.14.00.14.51 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 14 Feb 2013 00:14:52 -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 v9 8/8] watchdog: code: fix the alignement of some function declarations Date: Thu, 14 Feb 2013 09:14:30 +0100 Message-Id: <1360829670-10418-9-git-send-email-fabio.porcedda@gmail.com> X-Mailer: git-send-email 1.8.1.1 In-Reply-To: <1360829670-10418-1-git-send-email-fabio.porcedda@gmail.com> References: <1360829670-10418-1-git-send-email-fabio.porcedda@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130214_031455_555731_14AA8DFC X-CRM114-Status: GOOD ( 12.80 ) 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 [209.85.215.174 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 Cc: Wim Van Sebroeck Cc: linux-watchdog@vger.kernel.org --- drivers/watchdog/watchdog_core.c | 2 +- drivers/watchdog/watchdog_dev.c | 17 ++++++----------- 2 files changed, 7 insertions(+), 12 deletions(-) diff --git a/drivers/watchdog/watchdog_core.c b/drivers/watchdog/watchdog_core.c index 05d18b4..5cdd7b6 100644 --- a/drivers/watchdog/watchdog_core.c +++ b/drivers/watchdog/watchdog_core.c @@ -70,7 +70,7 @@ static void watchdog_check_min_max_timeout(struct watchdog_device *wdd) * A zero is returned on success and -EINVAL for failure. */ int watchdog_init_timeout(struct watchdog_device *wdd, - unsigned int timeout_parm, struct device *dev) + unsigned int timeout_parm, struct device *dev) { unsigned int t = 0; int ret = 0; diff --git a/drivers/watchdog/watchdog_dev.c b/drivers/watchdog/watchdog_dev.c index 08b48bb..776341b 100644 --- a/drivers/watchdog/watchdog_dev.c +++ b/drivers/watchdog/watchdog_dev.c @@ -162,8 +162,7 @@ out_stop: * Get the watchdog's status flags. */ -static int watchdog_get_status(struct watchdog_device *wddev, - unsigned int *status) +static int watchdog_get_status(struct watchdog_device *wddev, uint *status) { int err = 0; @@ -191,8 +190,7 @@ out_status: * @timeout: timeout to set in seconds */ -static int watchdog_set_timeout(struct watchdog_device *wddev, - unsigned int timeout) +static int watchdog_set_timeout(struct watchdog_device *wddev, uint timeout) { int err; @@ -225,8 +223,7 @@ out_timeout: * Get the time before a watchdog will reboot (if not pinged). */ -static int watchdog_get_timeleft(struct watchdog_device *wddev, - unsigned int *timeleft) +static int watchdog_get_timeleft(struct watchdog_device *wddev, uint *timeleft) { int err = 0; @@ -255,8 +252,7 @@ out_timeleft: * @arg: argument pointer */ -static int watchdog_ioctl_op(struct watchdog_device *wddev, unsigned int cmd, - unsigned long arg) +static int watchdog_ioctl_op(struct watchdog_device *wddev, uint cmd, ulong arg) { int err; @@ -290,7 +286,7 @@ out_ioctl: */ static ssize_t watchdog_write(struct file *file, const char __user *data, - size_t len, loff_t *ppos) + size_t len, loff_t *ppos) { struct watchdog_device *wdd = file->private_data; size_t i; @@ -329,8 +325,7 @@ static ssize_t watchdog_write(struct file *file, const char __user *data, * according to their available features. */ -static long watchdog_ioctl(struct file *file, unsigned int cmd, - unsigned long arg) +static long watchdog_ioctl(struct file *file, unsigned int cmd, ulong arg) { struct watchdog_device *wdd = file->private_data; void __user *argp = (void __user *)arg;