diff options
author | Stanislaw Gruszka <sgruszka@redhat.com> | 2011-08-16 08:17:04 -0400 |
---|---|---|
committer | Stanislaw Gruszka <sgruszka@redhat.com> | 2011-11-15 05:17:04 -0500 |
commit | d2ddf621aa45ac4cf4cce6359bfac6b49a8c6b34 (patch) | |
tree | 94ed27d88f2f922e0367470d5a02720b3727e066 /drivers/net/wireless/iwlegacy/iwl-eeprom.c | |
parent | 46bc8d4b0e73ac75de323646d75a2333f47b84c3 (diff) |
iwlegacy: rename iwlegacy to il
More renaming to make code shorter.
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
Diffstat (limited to 'drivers/net/wireless/iwlegacy/iwl-eeprom.c')
-rw-r--r-- | drivers/net/wireless/iwlegacy/iwl-eeprom.c | 54 |
1 files changed, 27 insertions, 27 deletions
diff --git a/drivers/net/wireless/iwlegacy/iwl-eeprom.c b/drivers/net/wireless/iwlegacy/iwl-eeprom.c index 5edec73a505e..f6b9d6d28d9e 100644 --- a/drivers/net/wireless/iwlegacy/iwl-eeprom.c +++ b/drivers/net/wireless/iwlegacy/iwl-eeprom.c | |||
@@ -77,7 +77,7 @@ | |||
77 | 77 | ||
78 | /************************** EEPROM BANDS **************************** | 78 | /************************** EEPROM BANDS **************************** |
79 | * | 79 | * |
80 | * The iwlegacy_eeprom_band definitions below provide the mapping from the | 80 | * The il_eeprom_band definitions below provide the mapping from the |
81 | * EEPROM contents to the specific channel number supported for each | 81 | * EEPROM contents to the specific channel number supported for each |
82 | * band. | 82 | * band. |
83 | * | 83 | * |
@@ -107,32 +107,32 @@ | |||
107 | *********************************************************************/ | 107 | *********************************************************************/ |
108 | 108 | ||
109 | /* 2.4 GHz */ | 109 | /* 2.4 GHz */ |
110 | const u8 iwlegacy_eeprom_band_1[14] = { | 110 | const u8 il_eeprom_band_1[14] = { |
111 | 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14 | 111 | 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14 |
112 | }; | 112 | }; |
113 | 113 | ||
114 | /* 5.2 GHz bands */ | 114 | /* 5.2 GHz bands */ |
115 | static const u8 iwlegacy_eeprom_band_2[] = { /* 4915-5080MHz */ | 115 | static const u8 il_eeprom_band_2[] = { /* 4915-5080MHz */ |
116 | 183, 184, 185, 187, 188, 189, 192, 196, 7, 8, 11, 12, 16 | 116 | 183, 184, 185, 187, 188, 189, 192, 196, 7, 8, 11, 12, 16 |
117 | }; | 117 | }; |
118 | 118 | ||
119 | static const u8 iwlegacy_eeprom_band_3[] = { /* 5170-5320MHz */ | 119 | static const u8 il_eeprom_band_3[] = { /* 5170-5320MHz */ |
120 | 34, 36, 38, 40, 42, 44, 46, 48, 52, 56, 60, 64 | 120 | 34, 36, 38, 40, 42, 44, 46, 48, 52, 56, 60, 64 |
121 | }; | 121 | }; |
122 | 122 | ||
123 | static const u8 iwlegacy_eeprom_band_4[] = { /* 5500-5700MHz */ | 123 | static const u8 il_eeprom_band_4[] = { /* 5500-5700MHz */ |
124 | 100, 104, 108, 112, 116, 120, 124, 128, 132, 136, 140 | 124 | 100, 104, 108, 112, 116, 120, 124, 128, 132, 136, 140 |
125 | }; | 125 | }; |
126 | 126 | ||
127 | static const u8 iwlegacy_eeprom_band_5[] = { /* 5725-5825MHz */ | 127 | static const u8 il_eeprom_band_5[] = { /* 5725-5825MHz */ |
128 | 145, 149, 153, 157, 161, 165 | 128 | 145, 149, 153, 157, 161, 165 |
129 | }; | 129 | }; |
130 | 130 | ||
131 | static const u8 iwlegacy_eeprom_band_6[] = { /* 2.4 ht40 channel */ | 131 | static const u8 il_eeprom_band_6[] = { /* 2.4 ht40 channel */ |
132 | 1, 2, 3, 4, 5, 6, 7 | 132 | 1, 2, 3, 4, 5, 6, 7 |
133 | }; | 133 | }; |
134 | 134 | ||
135 | static const u8 iwlegacy_eeprom_band_7[] = { /* 5.2 ht40 channel */ | 135 | static const u8 il_eeprom_band_7[] = { /* 5.2 ht40 channel */ |
136 | 36, 44, 52, 60, 100, 108, 116, 124, 132, 149, 157 | 136 | 36, 44, 52, 60, 100, 108, 116, 124, 132, 149, 157 |
137 | }; | 137 | }; |
138 | 138 | ||
@@ -273,46 +273,46 @@ static void il_init_band_reference(const struct il_priv *il, | |||
273 | eeprom_ops.regulatory_bands[eep_band - 1]; | 273 | eeprom_ops.regulatory_bands[eep_band - 1]; |
274 | switch (eep_band) { | 274 | switch (eep_band) { |
275 | case 1: /* 2.4GHz band */ | 275 | case 1: /* 2.4GHz band */ |
276 | *eeprom_ch_count = ARRAY_SIZE(iwlegacy_eeprom_band_1); | 276 | *eeprom_ch_count = ARRAY_SIZE(il_eeprom_band_1); |
277 | *eeprom_ch_info = (struct il_eeprom_channel *) | 277 | *eeprom_ch_info = (struct il_eeprom_channel *) |
278 | il_eeprom_query_addr(il, offset); | 278 | il_eeprom_query_addr(il, offset); |
279 | *eeprom_ch_index = iwlegacy_eeprom_band_1; | 279 | *eeprom_ch_index = il_eeprom_band_1; |
280 | break; | 280 | break; |
281 | case 2: /* 4.9GHz band */ | 281 | case 2: /* 4.9GHz band */ |
282 | *eeprom_ch_count = ARRAY_SIZE(iwlegacy_eeprom_band_2); | 282 | *eeprom_ch_count = ARRAY_SIZE(il_eeprom_band_2); |
283 | *eeprom_ch_info = (struct il_eeprom_channel *) | 283 | *eeprom_ch_info = (struct il_eeprom_channel *) |
284 | il_eeprom_query_addr(il, offset); | 284 | il_eeprom_query_addr(il, offset); |
285 | *eeprom_ch_index = iwlegacy_eeprom_band_2; | 285 | *eeprom_ch_index = il_eeprom_band_2; |
286 | break; | 286 | break; |
287 | case 3: /* 5.2GHz band */ | 287 | case 3: /* 5.2GHz band */ |
288 | *eeprom_ch_count = ARRAY_SIZE(iwlegacy_eeprom_band_3); | 288 | *eeprom_ch_count = ARRAY_SIZE(il_eeprom_band_3); |
289 | *eeprom_ch_info = (struct il_eeprom_channel *) | 289 | *eeprom_ch_info = (struct il_eeprom_channel *) |
290 | il_eeprom_query_addr(il, offset); | 290 | il_eeprom_query_addr(il, offset); |
291 | *eeprom_ch_index = iwlegacy_eeprom_band_3; | 291 | *eeprom_ch_index = il_eeprom_band_3; |
292 | break; | 292 | break; |
293 | case 4: /* 5.5GHz band */ | 293 | case 4: /* 5.5GHz band */ |
294 | *eeprom_ch_count = ARRAY_SIZE(iwlegacy_eeprom_band_4); | 294 | *eeprom_ch_count = ARRAY_SIZE(il_eeprom_band_4); |
295 | *eeprom_ch_info = (struct il_eeprom_channel *) | 295 | *eeprom_ch_info = (struct il_eeprom_channel *) |
296 | il_eeprom_query_addr(il, offset); | 296 | il_eeprom_query_addr(il, offset); |
297 | *eeprom_ch_index = iwlegacy_eeprom_band_4; | 297 | *eeprom_ch_index = il_eeprom_band_4; |
298 | break; | 298 | break; |
299 | case 5: /* 5.7GHz band */ | 299 | case 5: /* 5.7GHz band */ |
300 | *eeprom_ch_count = ARRAY_SIZE(iwlegacy_eeprom_band_5); | 300 | *eeprom_ch_count = ARRAY_SIZE(il_eeprom_band_5); |
301 | *eeprom_ch_info = (struct il_eeprom_channel *) | 301 | *eeprom_ch_info = (struct il_eeprom_channel *) |
302 | il_eeprom_query_addr(il, offset); | 302 | il_eeprom_query_addr(il, offset); |
303 | *eeprom_ch_index = iwlegacy_eeprom_band_5; | 303 | *eeprom_ch_index = il_eeprom_band_5; |
304 | break; | 304 | break; |
305 | case 6: /* 2.4GHz ht40 channels */ | 305 | case 6: /* 2.4GHz ht40 channels */ |
306 | *eeprom_ch_count = ARRAY_SIZE(iwlegacy_eeprom_band_6); | 306 | *eeprom_ch_count = ARRAY_SIZE(il_eeprom_band_6); |
307 | *eeprom_ch_info = (struct il_eeprom_channel *) | 307 | *eeprom_ch_info = (struct il_eeprom_channel *) |
308 | il_eeprom_query_addr(il, offset); | 308 | il_eeprom_query_addr(il, offset); |
309 | *eeprom_ch_index = iwlegacy_eeprom_band_6; | 309 | *eeprom_ch_index = il_eeprom_band_6; |
310 | break; | 310 | break; |
311 | case 7: /* 5 GHz ht40 channels */ | 311 | case 7: /* 5 GHz ht40 channels */ |
312 | *eeprom_ch_count = ARRAY_SIZE(iwlegacy_eeprom_band_7); | 312 | *eeprom_ch_count = ARRAY_SIZE(il_eeprom_band_7); |
313 | *eeprom_ch_info = (struct il_eeprom_channel *) | 313 | *eeprom_ch_info = (struct il_eeprom_channel *) |
314 | il_eeprom_query_addr(il, offset); | 314 | il_eeprom_query_addr(il, offset); |
315 | *eeprom_ch_index = iwlegacy_eeprom_band_7; | 315 | *eeprom_ch_index = il_eeprom_band_7; |
316 | break; | 316 | break; |
317 | default: | 317 | default: |
318 | BUG(); | 318 | BUG(); |
@@ -387,11 +387,11 @@ int il_init_channel_map(struct il_priv *il) | |||
387 | IL_DEBUG_EEPROM(il, "Initializing regulatory info from EEPROM\n"); | 387 | IL_DEBUG_EEPROM(il, "Initializing regulatory info from EEPROM\n"); |
388 | 388 | ||
389 | il->channel_count = | 389 | il->channel_count = |
390 | ARRAY_SIZE(iwlegacy_eeprom_band_1) + | 390 | ARRAY_SIZE(il_eeprom_band_1) + |
391 | ARRAY_SIZE(iwlegacy_eeprom_band_2) + | 391 | ARRAY_SIZE(il_eeprom_band_2) + |
392 | ARRAY_SIZE(iwlegacy_eeprom_band_3) + | 392 | ARRAY_SIZE(il_eeprom_band_3) + |
393 | ARRAY_SIZE(iwlegacy_eeprom_band_4) + | 393 | ARRAY_SIZE(il_eeprom_band_4) + |
394 | ARRAY_SIZE(iwlegacy_eeprom_band_5); | 394 | ARRAY_SIZE(il_eeprom_band_5); |
395 | 395 | ||
396 | IL_DEBUG_EEPROM(il, "Parsing data for %d channels.\n", | 396 | IL_DEBUG_EEPROM(il, "Parsing data for %d channels.\n", |
397 | il->channel_count); | 397 | il->channel_count); |