diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/wireless/prism54/isl_38xx.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/wireless/prism54/isl_38xx.c b/drivers/net/wireless/prism54/isl_38xx.c index 4481ec18c5a0..adc7499136dc 100644 --- a/drivers/net/wireless/prism54/isl_38xx.c +++ b/drivers/net/wireless/prism54/isl_38xx.c | |||
@@ -112,10 +112,10 @@ isl38xx_handle_wakeup(isl38xx_control_block *control_block, | |||
112 | void | 112 | void |
113 | isl38xx_trigger_device(int asleep, void __iomem *device_base) | 113 | isl38xx_trigger_device(int asleep, void __iomem *device_base) |
114 | { | 114 | { |
115 | struct timeval current_time; | ||
116 | u32 reg, counter = 0; | 115 | u32 reg, counter = 0; |
117 | 116 | ||
118 | #if VERBOSE > SHOW_ERROR_MESSAGES | 117 | #if VERBOSE > SHOW_ERROR_MESSAGES |
118 | struct timeval current_time; | ||
119 | DEBUG(SHOW_FUNCTION_CALLS, "isl38xx trigger device\n"); | 119 | DEBUG(SHOW_FUNCTION_CALLS, "isl38xx trigger device\n"); |
120 | #endif | 120 | #endif |
121 | 121 | ||
@@ -126,11 +126,11 @@ isl38xx_trigger_device(int asleep, void __iomem *device_base) | |||
126 | do_gettimeofday(¤t_time); | 126 | do_gettimeofday(¤t_time); |
127 | DEBUG(SHOW_TRACING, "%08li.%08li Device wakeup triggered\n", | 127 | DEBUG(SHOW_TRACING, "%08li.%08li Device wakeup triggered\n", |
128 | current_time.tv_sec, (long)current_time.tv_usec); | 128 | current_time.tv_sec, (long)current_time.tv_usec); |
129 | #endif | ||
130 | 129 | ||
131 | DEBUG(SHOW_TRACING, "%08li.%08li Device register read %08x\n", | 130 | DEBUG(SHOW_TRACING, "%08li.%08li Device register read %08x\n", |
132 | current_time.tv_sec, (long)current_time.tv_usec, | 131 | current_time.tv_sec, (long)current_time.tv_usec, |
133 | readl(device_base + ISL38XX_CTRL_STAT_REG)); | 132 | readl(device_base + ISL38XX_CTRL_STAT_REG)); |
133 | #endif | ||
134 | udelay(ISL38XX_WRITEIO_DELAY); | 134 | udelay(ISL38XX_WRITEIO_DELAY); |
135 | 135 | ||
136 | reg = readl(device_base + ISL38XX_INT_IDENT_REG); | 136 | reg = readl(device_base + ISL38XX_INT_IDENT_REG); |
@@ -148,10 +148,12 @@ isl38xx_trigger_device(int asleep, void __iomem *device_base) | |||
148 | counter++; | 148 | counter++; |
149 | } | 149 | } |
150 | 150 | ||
151 | #if VERBOSE > SHOW_ERROR_MESSAGES | ||
151 | DEBUG(SHOW_TRACING, | 152 | DEBUG(SHOW_TRACING, |
152 | "%08li.%08li Device register read %08x\n", | 153 | "%08li.%08li Device register read %08x\n", |
153 | current_time.tv_sec, (long)current_time.tv_usec, | 154 | current_time.tv_sec, (long)current_time.tv_usec, |
154 | readl(device_base + ISL38XX_CTRL_STAT_REG)); | 155 | readl(device_base + ISL38XX_CTRL_STAT_REG)); |
156 | #endif | ||
155 | udelay(ISL38XX_WRITEIO_DELAY); | 157 | udelay(ISL38XX_WRITEIO_DELAY); |
156 | 158 | ||
157 | #if VERBOSE > SHOW_ERROR_MESSAGES | 159 | #if VERBOSE > SHOW_ERROR_MESSAGES |