diff options
author | Joe Perches <joe@perches.com> | 2008-03-21 14:06:37 -0400 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2008-03-26 00:17:45 -0400 |
commit | 446490ca44dcc8a1a9f3c082809bdab208626891 (patch) | |
tree | c03c43be82866695c6793d9d46c838ed5d1e4457 /drivers/net/ixgb/ixgb_ee.c | |
parent | bab2bce7dcea9aaf9374b6c24001d6afcced4ca5 (diff) |
ixgb: convert boolean_t to bool
> send me a patch for e1000 and for ixgb and I'll happily apply those :)
boolean_t to bool
TRUE to true
FALSE to false
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/net/ixgb/ixgb_ee.c')
-rw-r--r-- | drivers/net/ixgb/ixgb_ee.c | 50 |
1 files changed, 25 insertions, 25 deletions
diff --git a/drivers/net/ixgb/ixgb_ee.c b/drivers/net/ixgb/ixgb_ee.c index e8eb0fd6c576..8e9302fc8865 100644 --- a/drivers/net/ixgb/ixgb_ee.c +++ b/drivers/net/ixgb/ixgb_ee.c | |||
@@ -36,7 +36,7 @@ static void ixgb_shift_out_bits(struct ixgb_hw *hw, | |||
36 | uint16_t count); | 36 | uint16_t count); |
37 | static void ixgb_standby_eeprom(struct ixgb_hw *hw); | 37 | static void ixgb_standby_eeprom(struct ixgb_hw *hw); |
38 | 38 | ||
39 | static boolean_t ixgb_wait_eeprom_command(struct ixgb_hw *hw); | 39 | static bool ixgb_wait_eeprom_command(struct ixgb_hw *hw); |
40 | 40 | ||
41 | static void ixgb_cleanup_eeprom(struct ixgb_hw *hw); | 41 | static void ixgb_cleanup_eeprom(struct ixgb_hw *hw); |
42 | 42 | ||
@@ -279,10 +279,10 @@ ixgb_cleanup_eeprom(struct ixgb_hw *hw) | |||
279 | * The command is done when the EEPROM's data out pin goes high. | 279 | * The command is done when the EEPROM's data out pin goes high. |
280 | * | 280 | * |
281 | * Returns: | 281 | * Returns: |
282 | * TRUE: EEPROM data pin is high before timeout. | 282 | * true: EEPROM data pin is high before timeout. |
283 | * FALSE: Time expired. | 283 | * false: Time expired. |
284 | *****************************************************************************/ | 284 | *****************************************************************************/ |
285 | static boolean_t | 285 | static bool |
286 | ixgb_wait_eeprom_command(struct ixgb_hw *hw) | 286 | ixgb_wait_eeprom_command(struct ixgb_hw *hw) |
287 | { | 287 | { |
288 | uint32_t eecd_reg; | 288 | uint32_t eecd_reg; |
@@ -301,12 +301,12 @@ ixgb_wait_eeprom_command(struct ixgb_hw *hw) | |||
301 | eecd_reg = IXGB_READ_REG(hw, EECD); | 301 | eecd_reg = IXGB_READ_REG(hw, EECD); |
302 | 302 | ||
303 | if(eecd_reg & IXGB_EECD_DO) | 303 | if(eecd_reg & IXGB_EECD_DO) |
304 | return (TRUE); | 304 | return (true); |
305 | 305 | ||
306 | udelay(50); | 306 | udelay(50); |
307 | } | 307 | } |
308 | ASSERT(0); | 308 | ASSERT(0); |
309 | return (FALSE); | 309 | return (false); |
310 | } | 310 | } |
311 | 311 | ||
312 | /****************************************************************************** | 312 | /****************************************************************************** |
@@ -319,10 +319,10 @@ ixgb_wait_eeprom_command(struct ixgb_hw *hw) | |||
319 | * valid. | 319 | * valid. |
320 | * | 320 | * |
321 | * Returns: | 321 | * Returns: |
322 | * TRUE: Checksum is valid | 322 | * true: Checksum is valid |
323 | * FALSE: Checksum is not valid. | 323 | * false: Checksum is not valid. |
324 | *****************************************************************************/ | 324 | *****************************************************************************/ |
325 | boolean_t | 325 | bool |
326 | ixgb_validate_eeprom_checksum(struct ixgb_hw *hw) | 326 | ixgb_validate_eeprom_checksum(struct ixgb_hw *hw) |
327 | { | 327 | { |
328 | uint16_t checksum = 0; | 328 | uint16_t checksum = 0; |
@@ -332,9 +332,9 @@ ixgb_validate_eeprom_checksum(struct ixgb_hw *hw) | |||
332 | checksum += ixgb_read_eeprom(hw, i); | 332 | checksum += ixgb_read_eeprom(hw, i); |
333 | 333 | ||
334 | if(checksum == (uint16_t) EEPROM_SUM) | 334 | if(checksum == (uint16_t) EEPROM_SUM) |
335 | return (TRUE); | 335 | return (true); |
336 | else | 336 | else |
337 | return (FALSE); | 337 | return (false); |
338 | } | 338 | } |
339 | 339 | ||
340 | /****************************************************************************** | 340 | /****************************************************************************** |
@@ -457,10 +457,10 @@ ixgb_read_eeprom(struct ixgb_hw *hw, | |||
457 | * hw - Struct containing variables accessed by shared code | 457 | * hw - Struct containing variables accessed by shared code |
458 | * | 458 | * |
459 | * Returns: | 459 | * Returns: |
460 | * TRUE: if eeprom read is successful | 460 | * true: if eeprom read is successful |
461 | * FALSE: otherwise. | 461 | * false: otherwise. |
462 | *****************************************************************************/ | 462 | *****************************************************************************/ |
463 | boolean_t | 463 | bool |
464 | ixgb_get_eeprom_data(struct ixgb_hw *hw) | 464 | ixgb_get_eeprom_data(struct ixgb_hw *hw) |
465 | { | 465 | { |
466 | uint16_t i; | 466 | uint16_t i; |
@@ -484,16 +484,16 @@ ixgb_get_eeprom_data(struct ixgb_hw *hw) | |||
484 | /* clear the init_ctrl_reg_1 to signify that the cache is | 484 | /* clear the init_ctrl_reg_1 to signify that the cache is |
485 | * invalidated */ | 485 | * invalidated */ |
486 | ee_map->init_ctrl_reg_1 = cpu_to_le16(EEPROM_ICW1_SIGNATURE_CLEAR); | 486 | ee_map->init_ctrl_reg_1 = cpu_to_le16(EEPROM_ICW1_SIGNATURE_CLEAR); |
487 | return (FALSE); | 487 | return (false); |
488 | } | 488 | } |
489 | 489 | ||
490 | if ((ee_map->init_ctrl_reg_1 & cpu_to_le16(EEPROM_ICW1_SIGNATURE_MASK)) | 490 | if ((ee_map->init_ctrl_reg_1 & cpu_to_le16(EEPROM_ICW1_SIGNATURE_MASK)) |
491 | != cpu_to_le16(EEPROM_ICW1_SIGNATURE_VALID)) { | 491 | != cpu_to_le16(EEPROM_ICW1_SIGNATURE_VALID)) { |
492 | DEBUGOUT("ixgb_ee: Signature invalid.\n"); | 492 | DEBUGOUT("ixgb_ee: Signature invalid.\n"); |
493 | return(FALSE); | 493 | return(false); |
494 | } | 494 | } |
495 | 495 | ||
496 | return(TRUE); | 496 | return(true); |
497 | } | 497 | } |
498 | 498 | ||
499 | /****************************************************************************** | 499 | /****************************************************************************** |
@@ -503,17 +503,17 @@ ixgb_get_eeprom_data(struct ixgb_hw *hw) | |||
503 | * hw - Struct containing variables accessed by shared code | 503 | * hw - Struct containing variables accessed by shared code |
504 | * | 504 | * |
505 | * Returns: | 505 | * Returns: |
506 | * TRUE: eeprom signature was good and the eeprom read was successful | 506 | * true: eeprom signature was good and the eeprom read was successful |
507 | * FALSE: otherwise. | 507 | * false: otherwise. |
508 | ******************************************************************************/ | 508 | ******************************************************************************/ |
509 | static boolean_t | 509 | static bool |
510 | ixgb_check_and_get_eeprom_data (struct ixgb_hw* hw) | 510 | ixgb_check_and_get_eeprom_data (struct ixgb_hw* hw) |
511 | { | 511 | { |
512 | struct ixgb_ee_map_type *ee_map = (struct ixgb_ee_map_type *)hw->eeprom; | 512 | struct ixgb_ee_map_type *ee_map = (struct ixgb_ee_map_type *)hw->eeprom; |
513 | 513 | ||
514 | if ((ee_map->init_ctrl_reg_1 & cpu_to_le16(EEPROM_ICW1_SIGNATURE_MASK)) | 514 | if ((ee_map->init_ctrl_reg_1 & cpu_to_le16(EEPROM_ICW1_SIGNATURE_MASK)) |
515 | == cpu_to_le16(EEPROM_ICW1_SIGNATURE_VALID)) { | 515 | == cpu_to_le16(EEPROM_ICW1_SIGNATURE_VALID)) { |
516 | return (TRUE); | 516 | return (true); |
517 | } else { | 517 | } else { |
518 | return ixgb_get_eeprom_data(hw); | 518 | return ixgb_get_eeprom_data(hw); |
519 | } | 519 | } |
@@ -533,7 +533,7 @@ ixgb_get_eeprom_word(struct ixgb_hw *hw, uint16_t index) | |||
533 | { | 533 | { |
534 | 534 | ||
535 | if ((index < IXGB_EEPROM_SIZE) && | 535 | if ((index < IXGB_EEPROM_SIZE) && |
536 | (ixgb_check_and_get_eeprom_data(hw) == TRUE)) { | 536 | (ixgb_check_and_get_eeprom_data(hw) == true)) { |
537 | return(hw->eeprom[index]); | 537 | return(hw->eeprom[index]); |
538 | } | 538 | } |
539 | 539 | ||
@@ -557,7 +557,7 @@ ixgb_get_ee_mac_addr(struct ixgb_hw *hw, | |||
557 | 557 | ||
558 | DEBUGFUNC("ixgb_get_ee_mac_addr"); | 558 | DEBUGFUNC("ixgb_get_ee_mac_addr"); |
559 | 559 | ||
560 | if (ixgb_check_and_get_eeprom_data(hw) == TRUE) { | 560 | if (ixgb_check_and_get_eeprom_data(hw) == true) { |
561 | for (i = 0; i < IXGB_ETH_LENGTH_OF_ADDRESS; i++) { | 561 | for (i = 0; i < IXGB_ETH_LENGTH_OF_ADDRESS; i++) { |
562 | mac_addr[i] = ee_map->mac_addr[i]; | 562 | mac_addr[i] = ee_map->mac_addr[i]; |
563 | DEBUGOUT2("mac(%d) = %.2X\n", i, mac_addr[i]); | 563 | DEBUGOUT2("mac(%d) = %.2X\n", i, mac_addr[i]); |
@@ -577,7 +577,7 @@ ixgb_get_ee_mac_addr(struct ixgb_hw *hw, | |||
577 | uint32_t | 577 | uint32_t |
578 | ixgb_get_ee_pba_number(struct ixgb_hw *hw) | 578 | ixgb_get_ee_pba_number(struct ixgb_hw *hw) |
579 | { | 579 | { |
580 | if(ixgb_check_and_get_eeprom_data(hw) == TRUE) | 580 | if (ixgb_check_and_get_eeprom_data(hw) == true) |
581 | return (le16_to_cpu(hw->eeprom[EEPROM_PBA_1_2_REG]) | 581 | return (le16_to_cpu(hw->eeprom[EEPROM_PBA_1_2_REG]) |
582 | | (le16_to_cpu(hw->eeprom[EEPROM_PBA_3_4_REG])<<16)); | 582 | | (le16_to_cpu(hw->eeprom[EEPROM_PBA_3_4_REG])<<16)); |
583 | 583 | ||
@@ -598,7 +598,7 @@ ixgb_get_ee_device_id(struct ixgb_hw *hw) | |||
598 | { | 598 | { |
599 | struct ixgb_ee_map_type *ee_map = (struct ixgb_ee_map_type *)hw->eeprom; | 599 | struct ixgb_ee_map_type *ee_map = (struct ixgb_ee_map_type *)hw->eeprom; |
600 | 600 | ||
601 | if(ixgb_check_and_get_eeprom_data(hw) == TRUE) | 601 | if (ixgb_check_and_get_eeprom_data(hw) == true) |
602 | return (le16_to_cpu(ee_map->device_id)); | 602 | return (le16_to_cpu(ee_map->device_id)); |
603 | 603 | ||
604 | return (0); | 604 | return (0); |