From patchwork Wed Nov 14 07:16:04 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wenyou Yang X-Patchwork-Id: 1739301 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 1FDC63FC64 for ; Wed, 14 Nov 2012 07:23:23 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TYXHB-0002S7-Ls; Wed, 14 Nov 2012 07:20:46 +0000 Received: from newsmtp5.atmel.com ([204.2.163.5] helo=sjogate2.atmel.com) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TYXG9-0002DS-Dq for linux-arm-kernel@lists.infradead.org; Wed, 14 Nov 2012 07:19:44 +0000 Received: from penbh01.corp.atmel.com ([10.168.5.31]) by sjogate2.atmel.com (8.13.6/8.13.6) with ESMTP id qAE7E6GJ008421; Tue, 13 Nov 2012 23:14:27 -0800 (PST) Received: from penmb01.corp.atmel.com ([10.168.5.33]) by penbh01.corp.atmel.com with Microsoft SMTPSVC(6.0.3790.3959); Wed, 14 Nov 2012 15:19:34 +0800 Received: from shaarm01.corp.atmel.com ([10.217.6.34]) by penmb01.corp.atmel.com with Microsoft SMTPSVC(6.0.3790.3959); Wed, 14 Nov 2012 15:19:34 +0800 From: Wenyou Yang To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 06/11] watchdog/at91sam9_wdt: change the timer function name Date: Wed, 14 Nov 2012 15:16:04 +0800 Message-Id: <1352877369-19740-7-git-send-email-wenyou.yang@atmel.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1352877369-19740-1-git-send-email-wenyou.yang@atmel.com> References: <1352877369-19740-1-git-send-email-wenyou.yang@atmel.com> X-OriginalArrivalTime: 14 Nov 2012 07:19:34.0447 (UTC) FILETIME=[65BD3BF0:01CDC238] X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20121114_021941_913822_7B7711B9 X-CRM114-Status: UNSURE ( 9.37 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -2.6 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.6 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record -0.7 RP_MATCHES_RCVD Envelope sender domain matches handover relay domain -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: linux-watchdog@vger.kernel.org, JM.Lin@atmel.com, nicolas.ferre@atmel.com, linux-kernel@vger.kernel.org, wenyou.yang@atmel.com, wim@iguana.be, plagnioj@jcrosoft.com 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 Change the timer function name "at91_ping" to "at91wdt_timer_tick" as an appropriate name, and change at91_wdt_reset to at91wdt_reset Signed-off-by: Wenyou Yang --- drivers/watchdog/at91sam9_wdt.c | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/drivers/watchdog/at91sam9_wdt.c b/drivers/watchdog/at91sam9_wdt.c index 84c2aa7..d764f36 100644 --- a/drivers/watchdog/at91sam9_wdt.c +++ b/drivers/watchdog/at91sam9_wdt.c @@ -62,8 +62,6 @@ module_param(nowayout, bool, 0); MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started " "(default=" __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); -static void at91_ping(unsigned long data); - struct at91wdt_drvdata { void __iomem *base; bool enabled; /* indicate if the watchdog is eabled */ @@ -90,24 +88,18 @@ static inline bool watchdog_is_open(struct watchdog_device *wddev) return test_bit(WDOG_DEV_OPEN, &wddev->status); } -/* - * Reload the watchdog timer. (ie, pat the watchdog) - */ -static inline void at91_wdt_reset(struct at91wdt_drvdata *driver_data) +static inline void at91wdt_reset(struct at91wdt_drvdata *driver_data) { wdt_write(driver_data, AT91_WDT_CR, AT91_WDT_KEY | AT91_WDT_WDRSTT); } -/* - * Timer tick - */ -static void at91_ping(unsigned long data) +static void at91wdt_timer_tick(unsigned long data) { struct watchdog_device *wddev = (struct watchdog_device *)data; struct at91wdt_drvdata *driver_data = watchdog_get_drvdata(wddev); if (time_before(jiffies, driver_data->next_heartbeat)) { - at91_wdt_reset(driver_data); + at91wdt_reset(driver_data); mod_timer(&driver_data->timer, jiffies + WDT_TIMEOUT); if (!watchdog_is_open(wddev)) @@ -240,7 +232,7 @@ static int __init at91wdt_probe(struct platform_device *pdev) } driver_data->next_heartbeat = jiffies + heartbeat * HZ; - setup_timer(&driver_data->timer, at91_ping, + setup_timer(&driver_data->timer, at91wdt_timer_tick, (unsigned long)&at91_wddev); mod_timer(&driver_data->timer, jiffies + WDT_TIMEOUT);