From: Sylvain Rochet <sylvain.rochet@finsecur.com>
To: Guenter Roeck <linux@roeck-us.net>,
Boris BREZILLON <boris.brezillon@free-electrons.com>,
linux-kernel@vger.kernel.org,
Nicolas Ferre <nicolas.ferre@atmel.com>,
Ludovic Desroches <ludovic.desroches@atmel.com>,
linux-arm-kernel@lists.infradead.org,
Alexandre Belloni <alexandre.belloni@free-electrons.com>,
Wenyou Yang <wenyou.yang@atmel.com>,
Wim Van Sebroeck <wim@iguana.be>
Cc: Sylvain Rochet <sylvain.rochet@finsecur.com>
Subject: [PATCH 4/6] watchdog: at91sam9: remove nowayout useless copy
Date: Thu, 8 Oct 2015 23:34:32 +0200 [thread overview]
Message-ID: <1444340074-15437-5-git-send-email-sylvain.rochet@finsecur.com> (raw)
In-Reply-To: <1444340074-15437-1-git-send-email-sylvain.rochet@finsecur.com>
nowayout is a global variable set by module parameter, remove the
nowayout useless copy.
Signed-off-by: Sylvain Rochet <sylvain.rochet@finsecur.com>
---
drivers/watchdog/at91sam9_wdt.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/drivers/watchdog/at91sam9_wdt.c b/drivers/watchdog/at91sam9_wdt.c
index 2c506e0..8629f48 100644
--- a/drivers/watchdog/at91sam9_wdt.c
+++ b/drivers/watchdog/at91sam9_wdt.c
@@ -86,7 +86,6 @@ struct at91wdt {
u32 mr;
u32 mr_mask;
unsigned long heartbeat; /* WDT heartbeat in jiffies */
- bool nowayout;
unsigned int irq;
struct clk *sclk;
};
@@ -233,7 +232,7 @@ static int at91_wdt_init(struct platform_device *pdev, struct at91wdt *wdt)
/* Try to set timeout from device tree first */
if (watchdog_init_timeout(&wdt->wdd, 0, dev))
watchdog_init_timeout(&wdt->wdd, wdt_timeout, dev);
- watchdog_set_nowayout(&wdt->wdd, wdt->nowayout);
+ watchdog_set_nowayout(&wdt->wdd, nowayout);
err = watchdog_register_device(&wdt->wdd);
if (err)
goto out_stop_timer;
@@ -338,7 +337,6 @@ static int __init at91wdt_probe(struct platform_device *pdev)
wdt->mr = (WDT_HW_TIMEOUT * 256) | AT91_WDT_WDRSTEN | AT91_WDT_WDD |
AT91_WDT_WDDBGHLT;
wdt->mr_mask = 0x3FFFFFFF;
- wdt->nowayout = nowayout;
wdt->wdd.parent = &pdev->dev;
wdt->wdd.info = &at91_wdt_info;
wdt->wdd.ops = &at91_wdt_ops;
@@ -376,7 +374,7 @@ static int __init at91wdt_probe(struct platform_device *pdev)
platform_set_drvdata(pdev, wdt);
pr_info("initialized (timeout=%d sec, nowayout=%d)\n",
- wdt->wdd.timeout, wdt->nowayout);
+ wdt->wdd.timeout, nowayout);
return 0;
--
2.5.1
next prev parent reply other threads:[~2015-10-08 21:35 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-08 21:34 [PATCH 0/6] watchdog: sama5d4 and at91sam9: trivial rework Sylvain Rochet
2015-10-08 21:34 ` [PATCH 1/6] watchdog: at91sam9: use devm_request_irq instead of request_irq Sylvain Rochet
2015-10-08 21:34 ` [PATCH 2/6] watchdog: at91sam9: use watchdog_get_drvdata instead of container_of Sylvain Rochet
2015-10-08 21:34 ` [PATCH 3/6] watchdog: at91sam9: rename heartbeats into timeout where necessary Sylvain Rochet
2015-10-12 10:07 ` Sylvain Rochet
2015-10-08 21:34 ` Sylvain Rochet [this message]
2015-10-08 21:34 ` [PATCH 5/6] watchdog: at91sam9: remove unused pdata support Sylvain Rochet
2015-10-08 21:34 ` [PATCH 6/6] watchdog: sama5d4: try to set timeout from device tree first Sylvain Rochet
2015-10-12 7:50 ` Alexandre Belloni
2015-10-12 8:12 ` Yang, Wenyou
2015-10-12 13:56 ` Sylvain Rochet
2015-10-12 9:09 ` Sylvain Rochet
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1444340074-15437-5-git-send-email-sylvain.rochet@finsecur.com \
--to=sylvain.rochet@finsecur.com \
--cc=alexandre.belloni@free-electrons.com \
--cc=boris.brezillon@free-electrons.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@roeck-us.net \
--cc=ludovic.desroches@atmel.com \
--cc=nicolas.ferre@atmel.com \
--cc=wenyou.yang@atmel.com \
--cc=wim@iguana.be \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®