aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging
diff options
context:
space:
mode:
authorPekka Enberg <penberg@cs.helsinki.fi>2009-04-08 04:14:06 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2009-06-19 14:00:38 -0400
commit833d0cd39ea0f1619e6ae9fa322d07761d59a8a3 (patch)
tree23ed16d813a217fe0d06157a6f257c54ac909675 /drivers/staging
parent7c49a0ac1294caa4ac791181c250f0b86d18a043 (diff)
Staging: w35und: make led lookup tables static
Impact: cleanup No need to keep read-only data on the stack. Acked-by: Pavel Machek <pavel@ucw.cz> Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging')
-rw-r--r--drivers/staging/winbond/wbusb.c17
1 files changed, 12 insertions, 5 deletions
diff --git a/drivers/staging/winbond/wbusb.c b/drivers/staging/winbond/wbusb.c
index 396dcabb814..c5fd054c0fa 100644
--- a/drivers/staging/winbond/wbusb.c
+++ b/drivers/staging/winbond/wbusb.c
@@ -171,14 +171,21 @@ static const struct ieee80211_ops wbsoft_ops = {
171 .get_tsf = wbsoft_get_tsf, 171 .get_tsf = wbsoft_get_tsf,
172}; 172};
173 173
174static u8 LED_GRAY[20] = {
175 0, 3, 4, 6, 8, 10, 11, 12, 13, 14, 15, 14, 13, 12, 11, 10, 8, 6, 4, 2
176};
177
178static u8 LED_GRAY2[30] = {
179 7, 8, 9, 10, 11, 12, 13, 14, 15, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
180 0, 15, 14, 13, 12, 11, 10, 9, 8
181};
182
174static void hal_led_control(unsigned long data) 183static void hal_led_control(unsigned long data)
175{ 184{
176 struct wbsoft_priv *adapter = (struct wbsoft_priv *)data; 185 struct wbsoft_priv *adapter = (struct wbsoft_priv *)data;
177 struct hw_data *pHwData = &adapter->sHwData; 186 struct hw_data *pHwData = &adapter->sHwData;
178 struct wb35_reg *reg = &pHwData->reg; 187 struct wb35_reg *reg = &pHwData->reg;
179 u32 LEDSet = (pHwData->SoftwareSet & HAL_LED_SET_MASK) >> HAL_LED_SET_SHIFT; 188 u32 LEDSet = (pHwData->SoftwareSet & HAL_LED_SET_MASK) >> HAL_LED_SET_SHIFT;
180 u8 LEDgray[20] = { 0, 3, 4, 6, 8, 10, 11, 12, 13, 14, 15, 14, 13, 12, 11, 10, 8, 6, 4, 2 };
181 u8 LEDgray2[30] = { 7, 8, 9, 10, 11, 12, 13, 14, 15, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 15, 14, 13, 12, 11, 10, 9, 8 };
182 u32 TimeInterval = 500, ltmp, ltmp2; 189 u32 TimeInterval = 500, ltmp, ltmp2;
183 ltmp = 0; 190 ltmp = 0;
184 191
@@ -287,10 +294,10 @@ static void hal_led_control(unsigned long data)
287 // 20060901 Gray blinking if in disconnect state and not scanning 294 // 20060901 Gray blinking if in disconnect state and not scanning
288 ltmp = reg->U1BC_LEDConfigure; 295 ltmp = reg->U1BC_LEDConfigure;
289 reg->U1BC_LEDConfigure &= ~0x1f; 296 reg->U1BC_LEDConfigure &= ~0x1f;
290 if (LEDgray2[(pHwData->LED_Blinking % 30)]) { 297 if (LED_GRAY2[(pHwData->LED_Blinking % 30)]) {
291 reg->U1BC_LEDConfigure |= 0x10; 298 reg->U1BC_LEDConfigure |= 0x10;
292 reg->U1BC_LEDConfigure |= 299 reg->U1BC_LEDConfigure |=
293 LEDgray2[(pHwData->LED_Blinking % 30)]; 300 LED_GRAY2[(pHwData->LED_Blinking % 30)];
294 } 301 }
295 pHwData->LED_Blinking++; 302 pHwData->LED_Blinking++;
296 if (reg->U1BC_LEDConfigure != ltmp) 303 if (reg->U1BC_LEDConfigure != ltmp)
@@ -376,7 +383,7 @@ static void hal_led_control(unsigned long data)
376 reg->U1BC_LEDConfigure &= ~0x0f; 383 reg->U1BC_LEDConfigure &= ~0x0f;
377 reg->U1BC_LEDConfigure |= 0x10; 384 reg->U1BC_LEDConfigure |= 0x10;
378 reg->U1BC_LEDConfigure |= 385 reg->U1BC_LEDConfigure |=
379 LEDgray[(pHwData->LED_Blinking - 1) % 20]; 386 LED_GRAY[(pHwData->LED_Blinking - 1) % 20];
380 Wb35Reg_Write(pHwData, 0x03bc, 387 Wb35Reg_Write(pHwData, 0x03bc,
381 reg->U1BC_LEDConfigure); 388 reg->U1BC_LEDConfigure);
382 389