All of lore.kernel.org
 help / color / mirror / Atom feed
From: Michal Simek <michal.simek@xilinx.com>
To: linux-kernel@vger.kernel.org, monstr@monstr.eu
Cc: Wim Van Sebroeck <wim@iguana.be>,
	linux-watchdog@vger.kernel.org,
	linux-arm-kernel@lists.infradead.org
Subject: [PATCH 02/10] watchdog: xilinx: Move control_status_reg to functions
Date: Fri, 31 Jan 2014 15:18:11 +0100	[thread overview]
Message-ID: <ca50a63f8e204043247268217f7981102da1e530.1391177880.git.michal.simek@xilinx.com> (raw)
In-Reply-To: <ed4cb31c9a549343e6b492cf62fc962d39034bd0.1391177880.git.michal.simek@xilinx.com>
In-Reply-To: <ed4cb31c9a549343e6b492cf62fc962d39034bd0.1391177880.git.michal.simek@xilinx.com>

[-- Attachment #1: Type: text/plain, Size: 1319 bytes --]

control_status_reg is temp variables and should be
used locally by specific function.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
---

 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


[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]

WARNING: multiple messages have this Message-ID (diff)
From: michal.simek@xilinx.com (Michal Simek)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 02/10] watchdog: xilinx: Move control_status_reg to functions
Date: Fri, 31 Jan 2014 15:18:11 +0100	[thread overview]
Message-ID: <ca50a63f8e204043247268217f7981102da1e530.1391177880.git.michal.simek@xilinx.com> (raw)
In-Reply-To: <ed4cb31c9a549343e6b492cf62fc962d39034bd0.1391177880.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>
---

 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/20140131/b7281859/attachment.sig>

  reply	other threads:[~2014-01-31 14:18 UTC|newest]

Thread overview: 79+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-01-31 14:18 [PATCH 01/10] watchdog: xilinx: Convert driver to the watchdog framework Michal Simek
2014-01-31 14:18 ` Michal Simek
2014-01-31 14:18 ` Michal Simek [this message]
2014-01-31 14:18   ` [PATCH 02/10] watchdog: xilinx: Move control_status_reg to functions Michal Simek
2014-02-09 20:05   ` Guenter Roeck
2014-02-09 20:05     ` Guenter Roeck
2014-01-31 14:18 ` [PATCH 03/10] watchdog: xilinx: Simplify probe and remove functions Michal Simek
2014-01-31 14:18   ` Michal Simek
2014-02-09 20:08   ` [03/10] " Guenter Roeck
2014-02-09 20:08     ` Guenter Roeck
2014-01-31 14:18 ` [PATCH 04/10] watchdog: xilinx: Move no_timeout to probe function Michal Simek
2014-01-31 14:18   ` Michal Simek
2014-02-09 20:09   ` Guenter Roeck
2014-02-09 20:09     ` Guenter Roeck
2014-01-31 14:18 ` [PATCH 05/10] watchdog: xilinx: Allocate private structure per device Michal Simek
2014-01-31 14:18   ` Michal Simek
2014-02-09 20:13   ` Guenter Roeck
2014-02-09 20:13     ` Guenter Roeck
2014-01-31 14:18 ` [PATCH 06/10] watchdog: xilinx: Fix all printk messages Michal Simek
2014-01-31 14:18   ` Michal Simek
2014-02-09 20:14   ` Guenter Roeck
2014-02-09 20:14     ` Guenter Roeck
2014-01-31 14:18 ` [PATCH 07/10] watchdog: xilinx: Fix OF binding Michal Simek
2014-01-31 14:18   ` Michal Simek
2014-01-31 14:18   ` Michal Simek
2014-01-31 17:33   ` Rob Herring
2014-01-31 17:33     ` Rob Herring
2014-01-31 17:33     ` Rob Herring
2014-02-03  7:59     ` Michal Simek
2014-02-03  7:59       ` Michal Simek
2014-02-03  7:59       ` Michal Simek
2014-02-03  8:01       ` Michal Simek
2014-02-03  8:01         ` Michal Simek
2014-02-03  8:01         ` Michal Simek
2014-02-03  8:01         ` Michal Simek
2014-02-09 20:18   ` Guenter Roeck
2014-02-09 20:18     ` Guenter Roeck
2014-01-31 14:18 ` [PATCH 08/10] watchdog: xilinx: Use correct comment indentation Michal Simek
2014-01-31 14:18   ` Michal Simek
2014-02-09 20:19   ` Guenter Roeck
2014-02-09 20:19     ` Guenter Roeck
2014-01-31 14:18 ` [PATCH 09/10] watchdog: xilinx: Add missing binding Michal Simek
2014-01-31 14:18   ` Michal Simek
2014-02-03 15:06   ` Arnd Bergmann
2014-02-03 15:06     ` Arnd Bergmann
2014-02-03 15:13     ` Michal Simek
2014-02-03 15:13       ` Michal Simek
2014-02-03 15:13       ` Michal Simek
2014-02-03 15:32       ` Arnd Bergmann
2014-02-03 15:32         ` Arnd Bergmann
2014-02-03 15:47         ` Michal Simek
2014-02-03 15:47           ` Michal Simek
2014-02-03 15:47           ` Michal Simek
2014-02-04 19:27           ` Arnd Bergmann
2014-02-04 19:27             ` Arnd Bergmann
2014-02-05  9:25             ` Michal Simek
2014-02-05  9:25               ` Michal Simek
2014-02-05  9:36               ` Arnd Bergmann
2014-02-05  9:36                 ` Arnd Bergmann
2014-02-05  9:36                 ` Arnd Bergmann
2014-02-05  9:41                 ` Michal Simek
2014-02-05  9:41                   ` Michal Simek
2014-02-05 14:00                   ` Arnd Bergmann
2014-02-05 14:00                     ` Arnd Bergmann
2014-02-05 14:00                     ` Arnd Bergmann
2014-01-31 14:18 ` [PATCH 10/10] watchdog: xilinx: Enable this driver for Zynq Michal Simek
2014-01-31 14:52   ` Guenter Roeck
2014-02-03  7:01     ` Michal Simek
2014-02-03  8:26       ` Guenter Roeck
2014-02-03  8:45         ` Michal Simek
2014-02-10  0:51   ` Guenter Roeck
2014-02-10  7:06     ` Michal Simek
2014-02-09 20:03 ` [PATCH 01/10] watchdog: xilinx: Convert driver to the watchdog framework Guenter Roeck
2014-02-09 20:03   ` Guenter Roeck
2014-02-10  7:03   ` Michal Simek
2014-02-10  7:03     ` Michal Simek
2014-02-10 17:18     ` Guenter Roeck
2014-02-10 17:18       ` Guenter Roeck
2014-02-10 17:18       ` 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=ca50a63f8e204043247268217f7981102da1e530.1391177880.git.michal.simek@xilinx.com \
    --to=michal.simek@xilinx.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-watchdog@vger.kernel.org \
    --cc=monstr@monstr.eu \
    --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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.