Return-path: Received: from server19320154104.serverpool.info ([193.201.54.104]:36370 "EHLO hauke-m.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752389Ab2KXWZE (ORCPT ); Sat, 24 Nov 2012 17:25:04 -0500 From: Hauke Mehrtens To: linville@tuxdriver.com Cc: linux-wireless@vger.kernel.org, wim@iguana.be, linux-watchdog@vger.kernel.org, castet.matthieu@free.fr, biblbroks@sezampro.rs, m@bues.ch, zajec5@gmail.com, linux-mips@linux-mips.org, Hauke Mehrtens Subject: [PATCH 03/15] watchdog: bcm47xx_wdt.c: rename ops methods Date: Sat, 24 Nov 2012 23:24:03 +0100 Message-Id: <1353795855-22236-4-git-send-email-hauke@hauke-m.de> (sfid-20121124_232515_051688_301CFFA0) In-Reply-To: <1353795855-22236-1-git-send-email-hauke@hauke-m.de> References: <1353795855-22236-1-git-send-email-hauke@hauke-m.de> Sender: linux-wireless-owner@vger.kernel.org List-ID: Rename the methods registered to struct watchdog_ops in order to add an other struct watchdog_ops using different ops in the next patch. Signed-off-by: Hauke Mehrtens --- drivers/watchdog/bcm47xx_wdt.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/drivers/watchdog/bcm47xx_wdt.c b/drivers/watchdog/bcm47xx_wdt.c index cf1191b..66f2d2b 100644 --- a/drivers/watchdog/bcm47xx_wdt.c +++ b/drivers/watchdog/bcm47xx_wdt.c @@ -49,7 +49,7 @@ static inline struct bcm47xx_wdt *bcm47xx_wdt_get(struct watchdog_device *wdd) return container_of(wdd, struct bcm47xx_wdt, wdd); } -static void bcm47xx_timer_tick(unsigned long data) +static void bcm47xx_wdt_soft_timer_tick(unsigned long data) { struct bcm47xx_wdt *wdt = (struct bcm47xx_wdt *)data; u32 next_tick = min(wdt->wdd.timeout * 1000, wdt->max_timer_ms); @@ -62,7 +62,7 @@ static void bcm47xx_timer_tick(unsigned long data) } } -static int bcm47xx_wdt_keepalive(struct watchdog_device *wdd) +static int bcm47xx_wdt_soft_keepalive(struct watchdog_device *wdd) { struct bcm47xx_wdt *wdt = bcm47xx_wdt_get(wdd); @@ -71,17 +71,17 @@ static int bcm47xx_wdt_keepalive(struct watchdog_device *wdd) return 0; } -static int bcm47xx_wdt_start(struct watchdog_device *wdd) +static int bcm47xx_wdt_soft_start(struct watchdog_device *wdd) { struct bcm47xx_wdt *wdt = bcm47xx_wdt_get(wdd); - bcm47xx_wdt_keepalive(wdd); - bcm47xx_timer_tick((unsigned long)wdt); + bcm47xx_wdt_soft_keepalive(wdd); + bcm47xx_wdt_soft_timer_tick((unsigned long)wdt); return 0; } -static int bcm47xx_wdt_stop(struct watchdog_device *wdd) +static int bcm47xx_wdt_soft_stop(struct watchdog_device *wdd) { struct bcm47xx_wdt *wdt = bcm47xx_wdt_get(wdd); @@ -91,8 +91,8 @@ static int bcm47xx_wdt_stop(struct watchdog_device *wdd) return 0; } -static int bcm47xx_wdt_set_timeout(struct watchdog_device *wdd, - unsigned int new_time) +static int bcm47xx_wdt_soft_set_timeout(struct watchdog_device *wdd, + unsigned int new_time) { if (new_time < 1 || new_time > WDT_MAX_TIME) { pr_warn("timeout value must be 1<=x<=%d, using %d\n", @@ -122,12 +122,12 @@ static int bcm47xx_wdt_notify_sys(struct notifier_block *this, return NOTIFY_DONE; } -static struct watchdog_ops bcm47xx_wdt_ops = { +static struct watchdog_ops bcm47xx_wdt_soft_ops = { .owner = THIS_MODULE, - .start = bcm47xx_wdt_start, - .stop = bcm47xx_wdt_stop, - .ping = bcm47xx_wdt_keepalive, - .set_timeout = bcm47xx_wdt_set_timeout, + .start = bcm47xx_wdt_soft_start, + .stop = bcm47xx_wdt_soft_stop, + .ping = bcm47xx_wdt_soft_keepalive, + .set_timeout = bcm47xx_wdt_soft_set_timeout, }; static int __devinit bcm47xx_wdt_probe(struct platform_device *pdev) @@ -138,10 +138,10 @@ static int __devinit bcm47xx_wdt_probe(struct platform_device *pdev) if (!wdt) return -ENXIO; - setup_timer(&wdt->soft_timer, bcm47xx_timer_tick, + setup_timer(&wdt->soft_timer, bcm47xx_wdt_soft_timer_tick, (long unsigned int)wdt); - wdt->wdd.ops = &bcm47xx_wdt_ops; + wdt->wdd.ops = &bcm47xx_wdt_soft_ops; wdt->wdd.info = &bcm47xx_wdt_info; wdt->wdd.timeout = WDT_DEFAULT_TIME; ret = wdt->wdd.ops->set_timeout(&wdt->wdd, timeout); -- 1.7.10.4