staging: rtl8712: rtl8712_efuse.c: Remove leading p from variable names

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

Remove leading 'p' from the name of the pointer variable padapter.
Issue found with Coccinelle.

Signed-off-by: Nishka Dasgupta <nishkadg.linux@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Nishka Dasgupta and committed by

Greg Kroah-Hartman 6 years ago fbcfbf65 f745aa40

+76 -76

1 changed file

expand all

drivers

staging

rtl8712

rtl8712_efuse.c

+76 -76

drivers/staging/rtl8712/rtl8712_efuse.c

··· 23 23 /* reserve 3 bytes for HW stop read */ 24 24 static int efuse_available_max_size = EFUSE_MAX_SIZE - 3 /*0x1FD*/; 25 25 26 - static void efuse_reg_ctrl(struct _adapter *padapter, u8 bPowerOn) 26 + static void efuse_reg_ctrl(struct _adapter *adapter, u8 bPowerOn) 27 27 { 28 28 u8 tmpu8 = 0; 29 29 ··· 31 31 /* -----------------e-fuse pwr & clk reg ctrl --------------- 32 32 * Enable LDOE25 Macro Block 33 33 */ 34 - tmpu8 = r8712_read8(padapter, EFUSE_TEST + 3); 34 + tmpu8 = r8712_read8(adapter, EFUSE_TEST + 3); 35 35 tmpu8 |= 0x80; 36 - r8712_write8(padapter, EFUSE_TEST + 3, tmpu8); 36 + r8712_write8(adapter, EFUSE_TEST + 3, tmpu8); 37 37 msleep(20); /* for some platform , need some delay time */ 38 38 /* Change Efuse Clock for write action to 40MHZ */ 39 - r8712_write8(padapter, EFUSE_CLK_CTRL, 0x03); 39 + r8712_write8(adapter, EFUSE_CLK_CTRL, 0x03); 40 40 msleep(20); /* for some platform , need some delay time */ 41 41 } else { 42 42 /* -----------------e-fuse pwr & clk reg ctrl ----------------- 43 43 * Disable LDOE25 Macro Block 44 44 */ 45 - tmpu8 = r8712_read8(padapter, EFUSE_TEST + 3); 45 + tmpu8 = r8712_read8(adapter, EFUSE_TEST + 3); 46 46 tmpu8 &= 0x7F; 47 - r8712_write8(padapter, EFUSE_TEST + 3, tmpu8); 47 + r8712_write8(adapter, EFUSE_TEST + 3, tmpu8); 48 48 /* Change Efuse Clock for write action to 500K */ 49 - r8712_write8(padapter, EFUSE_CLK_CTRL, 0x02); 49 + r8712_write8(adapter, EFUSE_CLK_CTRL, 0x02); 50 50 } 51 51 } 52 52 53 53 /* 54 54 * Before write E-Fuse, this function must be called. 55 55 */ 56 - u8 r8712_efuse_reg_init(struct _adapter *padapter) 56 + u8 r8712_efuse_reg_init(struct _adapter *adapter) 57 57 { 58 58 return true; 59 59 } 60 60 61 - void r8712_efuse_reg_uninit(struct _adapter *padapter) 61 + void r8712_efuse_reg_uninit(struct _adapter *adapter) 62 62 { 63 - efuse_reg_ctrl(padapter, false); 63 + efuse_reg_ctrl(adapter, false); 64 64 } 65 65 66 - static u8 efuse_one_byte_read(struct _adapter *padapter, u16 addr, u8 *data) 66 + static u8 efuse_one_byte_read(struct _adapter *adapter, u16 addr, u8 *data) 67 67 { 68 68 u8 tmpidx = 0, bResult; 69 69 70 70 /* -----------------e-fuse reg ctrl --------------------------------- */ 71 - r8712_write8(padapter, EFUSE_CTRL + 1, (u8)(addr & 0xFF)); /* address */ 72 - r8712_write8(padapter, EFUSE_CTRL + 2, ((u8)((addr >> 8) & 0x03)) | 73 - (r8712_read8(padapter, EFUSE_CTRL + 2) & 0xFC)); 74 - r8712_write8(padapter, EFUSE_CTRL + 3, 0x72); /* read cmd */ 71 + r8712_write8(adapter, EFUSE_CTRL + 1, (u8)(addr & 0xFF)); /* address */ 72 + r8712_write8(adapter, EFUSE_CTRL + 2, ((u8)((addr >> 8) & 0x03)) | 73 + (r8712_read8(adapter, EFUSE_CTRL + 2) & 0xFC)); 74 + r8712_write8(adapter, EFUSE_CTRL + 3, 0x72); /* read cmd */ 75 75 /* wait for complete */ 76 - while (!(0x80 & r8712_read8(padapter, EFUSE_CTRL + 3)) && 76 + while (!(0x80 & r8712_read8(adapter, EFUSE_CTRL + 3)) && 77 77 (tmpidx < 100)) 78 78 tmpidx++; 79 79 if (tmpidx < 100) { 80 - *data = r8712_read8(padapter, EFUSE_CTRL); 80 + *data = r8712_read8(adapter, EFUSE_CTRL); 81 81 bResult = true; 82 82 } else { 83 83 *data = 0xff; ··· 86 86 return bResult; 87 87 } 88 88 89 - static u8 efuse_one_byte_write(struct _adapter *padapter, u16 addr, u8 data) 89 + static u8 efuse_one_byte_write(struct _adapter *adapter, u16 addr, u8 data) 90 90 { 91 91 u8 tmpidx = 0, bResult; 92 92 93 93 /* -----------------e-fuse reg ctrl -------------------------------- */ 94 - r8712_write8(padapter, EFUSE_CTRL + 1, (u8)(addr & 0xFF)); /* address */ 95 - r8712_write8(padapter, EFUSE_CTRL + 2, ((u8)((addr >> 8) & 0x03)) | 96 - (r8712_read8(padapter, EFUSE_CTRL + 2) & 0xFC)); 97 - r8712_write8(padapter, EFUSE_CTRL, data); /* data */ 98 - r8712_write8(padapter, EFUSE_CTRL + 3, 0xF2); /* write cmd */ 94 + r8712_write8(adapter, EFUSE_CTRL + 1, (u8)(addr & 0xFF)); /* address */ 95 + r8712_write8(adapter, EFUSE_CTRL + 2, ((u8)((addr >> 8) & 0x03)) | 96 + (r8712_read8(adapter, EFUSE_CTRL + 2) & 0xFC)); 97 + r8712_write8(adapter, EFUSE_CTRL, data); /* data */ 98 + r8712_write8(adapter, EFUSE_CTRL + 3, 0xF2); /* write cmd */ 99 99 /* wait for complete */ 100 - while ((0x80 & r8712_read8(padapter, EFUSE_CTRL + 3)) && 100 + while ((0x80 & r8712_read8(adapter, EFUSE_CTRL + 3)) && 101 101 (tmpidx < 100)) 102 102 tmpidx++; 103 103 if (tmpidx < 100) ··· 107 107 return bResult; 108 108 } 109 109 110 - static u8 efuse_one_byte_rw(struct _adapter *padapter, u8 bRead, u16 addr, 110 + static u8 efuse_one_byte_rw(struct _adapter *adapter, u8 bRead, u16 addr, 111 111 u8 *data) 112 112 { 113 113 u8 tmpidx = 0, tmpv8 = 0, bResult; 114 114 115 115 /* -----------------e-fuse reg ctrl --------------------------------- */ 116 - r8712_write8(padapter, EFUSE_CTRL + 1, (u8)(addr & 0xFF)); /* address */ 116 + r8712_write8(adapter, EFUSE_CTRL + 1, (u8)(addr & 0xFF)); /* address */ 117 117 tmpv8 = ((u8)((addr >> 8) & 0x03)) | 118 - (r8712_read8(padapter, EFUSE_CTRL + 2) & 0xFC); 119 - r8712_write8(padapter, EFUSE_CTRL + 2, tmpv8); 118 + (r8712_read8(adapter, EFUSE_CTRL + 2) & 0xFC); 119 + r8712_write8(adapter, EFUSE_CTRL + 2, tmpv8); 120 120 if (bRead) { 121 - r8712_write8(padapter, EFUSE_CTRL + 3, 0x72); /* read cmd */ 122 - while (!(0x80 & r8712_read8(padapter, EFUSE_CTRL + 3)) && 121 + r8712_write8(adapter, EFUSE_CTRL + 3, 0x72); /* read cmd */ 122 + while (!(0x80 & r8712_read8(adapter, EFUSE_CTRL + 3)) && 123 123 (tmpidx < 100)) 124 124 tmpidx++; 125 125 if (tmpidx < 100) { 126 - *data = r8712_read8(padapter, EFUSE_CTRL); 126 + *data = r8712_read8(adapter, EFUSE_CTRL); 127 127 bResult = true; 128 128 } else { 129 129 *data = 0; 130 130 bResult = false; 131 131 } 132 132 } else { 133 - r8712_write8(padapter, EFUSE_CTRL, *data); /* data */ 134 - r8712_write8(padapter, EFUSE_CTRL + 3, 0xF2); /* write cmd */ 135 - while ((0x80 & r8712_read8(padapter, EFUSE_CTRL + 3)) && 133 + r8712_write8(adapter, EFUSE_CTRL, *data); /* data */ 134 + r8712_write8(adapter, EFUSE_CTRL + 3, 0xF2); /* write cmd */ 135 + while ((0x80 & r8712_read8(adapter, EFUSE_CTRL + 3)) && 136 136 (tmpidx < 100)) 137 137 tmpidx++; 138 138 if (tmpidx < 100) ··· 143 143 return bResult; 144 144 } 145 145 146 - static u8 efuse_is_empty(struct _adapter *padapter, u8 *empty) 146 + static u8 efuse_is_empty(struct _adapter *adapter, u8 *empty) 147 147 { 148 148 u8 value, ret = true; 149 149 150 150 /* read one byte to check if E-Fuse is empty */ 151 - if (efuse_one_byte_rw(padapter, true, 0, &value)) { 151 + if (efuse_one_byte_rw(adapter, true, 0, &value)) { 152 152 if (value == 0xFF) 153 153 *empty = true; 154 154 else ··· 159 159 return ret; 160 160 } 161 161 162 - void r8712_efuse_change_max_size(struct _adapter *padapter) 162 + void r8712_efuse_change_max_size(struct _adapter *adapter) 163 163 { 164 164 u16 pre_pg_data_saddr = 0x1FB; 165 165 u16 i; ··· 167 167 u8 pre_pg_data[5]; 168 168 169 169 for (i = 0; i < pre_pg_data_size; i++) 170 - efuse_one_byte_read(padapter, pre_pg_data_saddr + i, 170 + efuse_one_byte_read(adapter, pre_pg_data_saddr + i, 171 171 &pre_pg_data[i]); 172 172 if ((pre_pg_data[0] == 0x03) && (pre_pg_data[1] == 0x00) && 173 173 (pre_pg_data[2] == 0x00) && (pre_pg_data[3] == 0x00) && ··· 175 175 efuse_available_max_size -= pre_pg_data_size; 176 176 } 177 177 178 - int r8712_efuse_get_max_size(struct _adapter *padapter) 178 + int r8712_efuse_get_max_size(struct _adapter *adapter) 179 179 { 180 180 return efuse_available_max_size; 181 181 } ··· 206 206 } 207 207 } 208 208 209 - u16 r8712_efuse_get_current_size(struct _adapter *padapter) 209 + u16 r8712_efuse_get_current_size(struct _adapter *adapter) 210 210 { 211 211 int bContinual = true; 212 212 u16 efuse_addr = 0; 213 213 u8 hworden = 0; 214 214 u8 efuse_data, word_cnts = 0; 215 215 216 - while (bContinual && efuse_one_byte_read(padapter, efuse_addr, 216 + while (bContinual && efuse_one_byte_read(adapter, efuse_addr, 217 217 &efuse_data) && (efuse_addr < efuse_available_max_size)) { 218 218 if (efuse_data != 0xFF) { 219 219 hworden = efuse_data & 0x0F; ··· 227 227 return efuse_addr; 228 228 } 229 229 230 - u8 r8712_efuse_pg_packet_read(struct _adapter *padapter, u8 offset, u8 *data) 230 + u8 r8712_efuse_pg_packet_read(struct _adapter *adapter, u8 offset, u8 *data) 231 231 { 232 232 u8 hoffset = 0, hworden = 0, word_cnts = 0; 233 233 u16 efuse_addr = 0; ··· 242 242 return false; 243 243 memset(data, 0xFF, sizeof(u8) * PGPKT_DATA_SIZE); 244 244 while (efuse_addr < efuse_available_max_size) { 245 - if (efuse_one_byte_read(padapter, efuse_addr, &efuse_data)) { 245 + if (efuse_one_byte_read(adapter, efuse_addr, &efuse_data)) { 246 246 if (efuse_data == 0xFF) 247 247 break; 248 248 hoffset = (efuse_data >> 4) & 0x0F; ··· 252 252 memset(tmpdata, 0xFF, PGPKT_DATA_SIZE); 253 253 for (tmpidx = 0; tmpidx < word_cnts * 2; 254 254 tmpidx++) { 255 - if (efuse_one_byte_read(padapter, 255 + if (efuse_one_byte_read(adapter, 256 256 efuse_addr + 1 + tmpidx, 257 257 &efuse_data)) { 258 258 tmpdata[tmpidx] = efuse_data; ··· 271 271 return ret; 272 272 } 273 273 274 - static u8 fix_header(struct _adapter *padapter, u8 header, u16 header_addr) 274 + static u8 fix_header(struct _adapter *adapter, u8 header, u16 header_addr) 275 275 { 276 276 struct PGPKT_STRUCT pkt; 277 277 u8 offset, word_en, value; ··· 287 287 /* retrieve original data */ 288 288 addr = 0; 289 289 while (addr < header_addr) { 290 - if (!efuse_one_byte_read(padapter, addr++, &value)) { 290 + if (!efuse_one_byte_read(adapter, addr++, &value)) { 291 291 ret = false; 292 292 break; 293 293 } ··· 301 301 if (BIT(i) & word_en) { 302 302 if (BIT(i) & pkt.word_en) { 303 303 if (efuse_one_byte_read( 304 - padapter, addr, 304 + adapter, addr, 305 305 &value)) 306 306 pkt.data[i * 2] = value; 307 307 else 308 308 return false; 309 309 if (efuse_one_byte_read( 310 - padapter, 310 + adapter, 311 311 addr + 1, 312 312 &value)) 313 313 pkt.data[i * 2 + 1] = ··· 325 325 /* fill original data */ 326 326 for (i = 0; i < PGPKG_MAX_WORDS; i++) { 327 327 if (BIT(i) & pkt.word_en) { 328 - efuse_one_byte_write(padapter, addr, pkt.data[i * 2]); 329 - efuse_one_byte_write(padapter, addr + 1, 328 + efuse_one_byte_write(adapter, addr, pkt.data[i * 2]); 329 + efuse_one_byte_write(adapter, addr + 1, 330 330 pkt.data[i * 2 + 1]); 331 331 /* additional check */ 332 - if (!efuse_one_byte_read(padapter, addr, &value)) { 332 + if (!efuse_one_byte_read(adapter, addr, &value)) { 333 333 ret = false; 334 334 } else if (pkt.data[i * 2] != value) { 335 335 ret = false; 336 336 if (value == 0xFF) /* write again */ 337 - efuse_one_byte_write(padapter, addr, 337 + efuse_one_byte_write(adapter, addr, 338 338 pkt.data[i * 2]); 339 339 } 340 - if (!efuse_one_byte_read(padapter, addr + 1, &value)) { 340 + if (!efuse_one_byte_read(adapter, addr + 1, &value)) { 341 341 ret = false; 342 342 } else if (pkt.data[i * 2 + 1] != value) { 343 343 ret = false; 344 344 if (value == 0xFF) /* write again */ 345 - efuse_one_byte_write(padapter, addr + 1, 345 + efuse_one_byte_write(adapter, addr + 1, 346 346 pkt.data[i * 2 + 347 347 1]); 348 348 } ··· 352 352 return ret; 353 353 } 354 354 355 - u8 r8712_efuse_pg_packet_write(struct _adapter *padapter, const u8 offset, 355 + u8 r8712_efuse_pg_packet_write(struct _adapter *adapter, const u8 offset, 356 356 const u8 word_en, const u8 *data) 357 357 { 358 358 u8 pg_header = 0; ··· 363 363 u8 bResult = true; 364 364 365 365 /* check if E-Fuse Clock Enable and E-Fuse Clock is 40M */ 366 - efuse_data = r8712_read8(padapter, EFUSE_CLK_CTRL); 366 + efuse_data = r8712_read8(adapter, EFUSE_CLK_CTRL); 367 367 if (efuse_data != 0x03) 368 368 return false; 369 369 pg_header = MAKE_EFUSE_HEADER(offset, word_en); ··· 371 371 repeat_times = 0; 372 372 efuse_addr = 0; 373 373 while (efuse_addr < efuse_available_max_size) { 374 - curr_size = r8712_efuse_get_current_size(padapter); 374 + curr_size = r8712_efuse_get_current_size(adapter); 375 375 if ((curr_size + 1 + target_word_cnts * 2) > 376 376 efuse_available_max_size) 377 377 return false; /*target_word_cnts + pg header(1 byte)*/ 378 378 efuse_addr = curr_size; /* current size is also the last addr*/ 379 - efuse_one_byte_write(padapter, efuse_addr, pg_header); /*hdr*/ 379 + efuse_one_byte_write(adapter, efuse_addr, pg_header); /*hdr*/ 380 380 sub_repeat = 0; 381 381 /* check if what we read is what we write */ 382 - while (!efuse_one_byte_read(padapter, efuse_addr, 382 + while (!efuse_one_byte_read(adapter, efuse_addr, 383 383 &efuse_data)) { 384 384 if (++sub_repeat > _REPEAT_THRESHOLD_) { 385 385 bResult = false; /* continue to blind write */ ··· 394 394 /* go to next address */ 395 395 efuse_addr++; 396 396 for (i = 0; i < target_word_cnts * 2; i++) { 397 - efuse_one_byte_write(padapter, 397 + efuse_one_byte_write(adapter, 398 398 efuse_addr + i, 399 399 *(data + i)); 400 - if (!efuse_one_byte_read(padapter, 400 + if (!efuse_one_byte_read(adapter, 401 401 efuse_addr + i, 402 402 &efuse_data)) 403 403 bResult = false; ··· 411 411 if (efuse_data == 0xFF) 412 412 return bResult; /* nothing damaged. */ 413 413 /* call rescue procedure */ 414 - if (!fix_header(padapter, efuse_data, efuse_addr)) 414 + if (!fix_header(adapter, efuse_data, efuse_addr)) 415 415 return false; /* rescue fail */ 416 416 417 417 if (++repeat_times > _REPEAT_THRESHOLD_) /* fail */ ··· 421 421 return bResult; 422 422 } 423 423 424 - u8 r8712_efuse_access(struct _adapter *padapter, u8 bRead, u16 start_addr, 424 + u8 r8712_efuse_access(struct _adapter *adapter, u8 bRead, u16 start_addr, 425 425 u16 cnts, u8 *data) 426 426 { 427 427 int i; ··· 432 432 if (!bRead && ((start_addr + cnts) > 433 433 efuse_available_max_size)) 434 434 return false; 435 - if (!bRead && !r8712_efuse_reg_init(padapter)) 435 + if (!bRead && !r8712_efuse_reg_init(adapter)) 436 436 return false; 437 437 /* -----------------e-fuse one byte read / write ---------------------*/ 438 438 for (i = 0; i < cnts; i++) { ··· 440 440 res = false; 441 441 break; 442 442 } 443 - res = efuse_one_byte_rw(padapter, bRead, start_addr + i, 443 + res = efuse_one_byte_rw(adapter, bRead, start_addr + i, 444 444 data + i); 445 445 if (!bRead && !res) 446 446 break; 447 447 } 448 448 if (!bRead) 449 - r8712_efuse_reg_uninit(padapter); 449 + r8712_efuse_reg_uninit(adapter); 450 450 return res; 451 451 } 452 452 453 - u8 r8712_efuse_map_read(struct _adapter *padapter, u16 addr, u16 cnts, u8 *data) 453 + u8 r8712_efuse_map_read(struct _adapter *adapter, u16 addr, u16 cnts, u8 *data) 454 454 { 455 455 u8 offset, ret = true; 456 456 u8 pktdata[PGPKT_DATA_SIZE]; ··· 458 458 459 459 if ((addr + cnts) > EFUSE_MAP_MAX_SIZE) 460 460 return false; 461 - if (efuse_is_empty(padapter, &offset) && offset) { 461 + if (efuse_is_empty(adapter, &offset) && offset) { 462 462 for (i = 0; i < cnts; i++) 463 463 data[i] = 0xFF; 464 464 return ret; 465 465 } 466 466 offset = (addr >> 3) & 0xF; 467 - ret = r8712_efuse_pg_packet_read(padapter, offset, pktdata); 467 + ret = r8712_efuse_pg_packet_read(adapter, offset, pktdata); 468 468 i = addr & 0x7; /* pktdata index */ 469 469 idx = 0; /* data index */ 470 470 ··· 475 475 return ret; 476 476 } 477 477 offset++; 478 - if (!r8712_efuse_pg_packet_read(padapter, offset, pktdata)) 478 + if (!r8712_efuse_pg_packet_read(adapter, offset, pktdata)) 479 479 ret = false; 480 480 i = 0; 481 481 } while (1); 482 482 return ret; 483 483 } 484 484 485 - u8 r8712_efuse_map_write(struct _adapter *padapter, u16 addr, u16 cnts, 485 + u8 r8712_efuse_map_write(struct _adapter *adapter, u16 addr, u16 cnts, 486 486 u8 *data) 487 487 { 488 488 u8 offset, word_en, empty; ··· 492 492 if ((addr + cnts) > EFUSE_MAP_MAX_SIZE) 493 493 return false; 494 494 /* check if E-Fuse Clock Enable and E-Fuse Clock is 40M */ 495 - empty = r8712_read8(padapter, EFUSE_CLK_CTRL); 495 + empty = r8712_read8(adapter, EFUSE_CLK_CTRL); 496 496 if (empty != 0x03) 497 497 return false; 498 - if (efuse_is_empty(padapter, &empty)) { 498 + if (efuse_is_empty(adapter, &empty)) { 499 499 if (empty) 500 500 memset(pktdata, 0xFF, PGPKT_DATA_SIZE); 501 501 } else { ··· 503 503 } 504 504 offset = (addr >> 3) & 0xF; 505 505 if (!empty) 506 - if (!r8712_efuse_pg_packet_read(padapter, offset, pktdata)) 506 + if (!r8712_efuse_pg_packet_read(adapter, offset, pktdata)) 507 507 return false; 508 508 word_en = 0xF; 509 509 memset(newdata, 0xFF, PGPKT_DATA_SIZE); ··· 546 546 } 547 547 548 548 if (word_en != 0xF) 549 - if (!r8712_efuse_pg_packet_write(padapter, offset, 549 + if (!r8712_efuse_pg_packet_write(adapter, offset, 550 550 word_en, newdata)) 551 551 return false; 552 552 if (idx == cnts) 553 553 break; 554 554 offset++; 555 555 if (!empty) 556 - if (!r8712_efuse_pg_packet_read(padapter, offset, 556 + if (!r8712_efuse_pg_packet_read(adapter, offset, 557 557 pktdata)) 558 558 return false; 559 559 i = 0;