summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorFlorian Fainelli <florian.fainelli@telecomint.eu>2008-02-25 13:39:57 +0100
committerWim Van Sebroeck <wim@iguana.be>2008-03-06 12:30:32 +0100
commit996d62d449a7d5e691b0da22b7c877df08c2b0a4 (patch)
treecfad4f591da2f0d693a065b540b22703180665fd /drivers
parent[WATCHDOG] replace remaining __FUNCTION__ occurrences (diff)
downloadlinux-996d62d449a7d5e691b0da22b7c877df08c2b0a4.tar.xz
linux-996d62d449a7d5e691b0da22b7c877df08c2b0a4.zip
[WATCHDOG] Remove volatiles from watchdog device structures
Remove the volatile since those are useless in such a structure. Signed-off-by: Florian Fainelli <florian.fainelli@telecomint.eu> Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/watchdog/cpu5wdt.c4
-rw-r--r--drivers/watchdog/mtx-1_wdt.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/watchdog/cpu5wdt.c b/drivers/watchdog/cpu5wdt.c
index 5941ca601a3a..df72f90123df 100644
--- a/drivers/watchdog/cpu5wdt.c
+++ b/drivers/watchdog/cpu5wdt.c
@@ -59,9 +59,9 @@ static int ticks = 10000;
static struct {
struct completion stop;
- volatile int running;
+ int running;
struct timer_list timer;
- volatile int queue;
+ int queue;
int default_ticks;
unsigned long inuse;
} cpu5wdt_device;
diff --git a/drivers/watchdog/mtx-1_wdt.c b/drivers/watchdog/mtx-1_wdt.c
index 789831b3fa00..10b89f2703bd 100644
--- a/drivers/watchdog/mtx-1_wdt.c
+++ b/drivers/watchdog/mtx-1_wdt.c
@@ -59,9 +59,9 @@ static int ticks = 100 * HZ;
static struct {
struct completion stop;
- volatile int running;
+ int running;
struct timer_list timer;
- volatile int queue;
+ int queue;
int default_ticks;
unsigned long inuse;
unsigned gpio;