From: michal.simek@xilinx.com (Michal Simek)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v2 02/11] watchdog: xilinx: Move control_status_reg to functions
Date: Tue, 11 Feb 2014 07:55:45 +0100 [thread overview]
Message-ID: <edb974b379ad91a5736d95133ac5dc6de882f5a6.1392101734.git.michal.simek@xilinx.com> (raw)
In-Reply-To: <f298edd222c57b0ce1ebad3ae50c3f715406c631.1392101734.git.michal.simek@xilinx.com>
control_status_reg is temp variables and should be
used locally by specific function.
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
---
Changes in v2: None
drivers/watchdog/of_xilinx_wdt.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/drivers/watchdog/of_xilinx_wdt.c b/drivers/watchdog/of_xilinx_wdt.c
index 8c2814e..aca9bab 100644
--- a/drivers/watchdog/of_xilinx_wdt.c
+++ b/drivers/watchdog/of_xilinx_wdt.c
@@ -52,13 +52,14 @@ struct xwdt_device {
static struct xwdt_device xdev;
static u32 timeout;
-static u32 control_status_reg;
static u8 no_timeout;
static DEFINE_SPINLOCK(spinlock);
static int xilinx_wdt_start(struct watchdog_device *wdd)
{
+ u32 control_status_reg;
+
spin_lock(&spinlock);
/* Clean previous status and enable the watchdog timer */
@@ -77,6 +78,8 @@ static int xilinx_wdt_start(struct watchdog_device *wdd)
static int xilinx_wdt_stop(struct watchdog_device *wdd)
{
+ u32 control_status_reg;
+
spin_lock(&spinlock);
control_status_reg = ioread32(xdev.base + XWT_TWCSR0_OFFSET);
@@ -94,6 +97,8 @@ static int xilinx_wdt_stop(struct watchdog_device *wdd)
static int xilinx_wdt_keepalive(struct watchdog_device *wdd)
{
+ u32 control_status_reg;
+
spin_lock(&spinlock);
control_status_reg = ioread32(xdev.base + XWT_TWCSR0_OFFSET);
--
1.8.2.3
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20140211/425aca82/attachment-0001.sig>
next prev parent reply other threads:[~2014-02-11 6:55 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-02-11 6:55 [PATCH v2 01/11] watchdog: xilinx: Convert driver to the watchdog framework Michal Simek
2014-02-11 6:55 ` Michal Simek [this message]
2014-02-11 6:55 ` [PATCH v2 03/11] watchdog: xilinx: Simplify probe and remove functions Michal Simek
2014-02-11 6:55 ` [PATCH v2 04/11] watchdog: xilinx: Move no_timeout to probe function Michal Simek
2014-02-11 6:55 ` [PATCH v2 05/11] watchdog: xilinx: Allocate private structure per device Michal Simek
2014-02-11 6:55 ` [PATCH v2 06/11] watchdog: xilinx: Fix all printk messages Michal Simek
2014-02-11 6:55 ` [PATCH v2 07/11] watchdog: xilinx: Use of_property_read_u32 Michal Simek
2014-02-11 20:20 ` Guenter Roeck
2014-02-12 8:13 ` Michal Simek
2014-02-11 6:55 ` [PATCH v2 08/11] watchdog: xilinx: Use correct comment indentation Michal Simek
2014-02-11 6:55 ` [PATCH v2 09/11] watchdog: xilinx: Add missing binding Michal Simek
2014-02-11 6:55 ` [PATCH v2 11/11] watchdog: xilinx: Remove no_timeout variable Michal Simek
2014-02-11 20:17 ` Guenter Roeck
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=edb974b379ad91a5736d95133ac5dc6de882f5a6.1392101734.git.michal.simek@xilinx.com \
--to=michal.simek@xilinx.com \
--cc=linux-arm-kernel@lists.infradead.org \
/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;
as well as URLs for NNTP newsgroup(s).