diff options
| author | Michal Simek <michal.simek@xilinx.com> | 2014-02-12 14:34:33 +0100 |
|---|---|---|
| committer | Wim Van Sebroeck <wim@iguana.be> | 2014-03-31 13:29:00 +0200 |
| commit | 5cf4e69d39f6a31a5305d01690c1607356b1483b (patch) | |
| tree | 51d994ee3f0561c828a956e1b2d9d3ed3794e3be | |
| parent | d14fd9645501444f06034339118de56686e25dfb (diff) | |
| download | linux-5cf4e69d39f6a31a5305d01690c1607356b1483b.tar.gz | |
watchdog: xilinx: Move control_status_reg to functions
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>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
| -rw-r--r-- | drivers/watchdog/of_xilinx_wdt.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/watchdog/of_xilinx_wdt.c b/drivers/watchdog/of_xilinx_wdt.c index 0e6c188f55ae7c..9cab3fd4f14c28 100644 --- a/drivers/watchdog/of_xilinx_wdt.c +++ b/drivers/watchdog/of_xilinx_wdt.c @@ -51,13 +51,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 */ @@ -76,6 +77,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); @@ -93,6 +96,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); |