aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/qlcnic
diff options
context:
space:
mode:
authorAmit Kumar Salecha <amit.salecha@qlogic.com>2010-08-25 00:03:05 -0400
committerDavid S. Miller <davem@davemloft.net>2010-08-25 17:15:29 -0400
commit31018e068edb9eed740bec5cf14802c3c676c9ee (patch)
tree8523393ac6b90772662f4afebe518655559ed3d6 /drivers/net/qlcnic
parentb18971d199cf35f68ffa22e4be1c477493fdb7e1 (diff)
qlcnic: change reg name
Change QLCNIC_CRB_DEV_REF_COUNT to QLCNIC_CRB_DRV_ACTIVE to match document. Signed-off-by: Amit Kumar Salecha <amit.salecha@qlogic.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/qlcnic')
-rw-r--r--drivers/net/qlcnic/qlcnic_ethtool.c2
-rw-r--r--drivers/net/qlcnic/qlcnic_hdr.h2
-rw-r--r--drivers/net/qlcnic/qlcnic_main.c12
3 files changed, 8 insertions, 8 deletions
diff --git a/drivers/net/qlcnic/qlcnic_ethtool.c b/drivers/net/qlcnic/qlcnic_ethtool.c
index 2805f88aaf7c..e294b825bac5 100644
--- a/drivers/net/qlcnic/qlcnic_ethtool.c
+++ b/drivers/net/qlcnic/qlcnic_ethtool.c
@@ -99,7 +99,7 @@ static const u32 diag_registers[] = {
99 CRB_XG_STATE_P3, 99 CRB_XG_STATE_P3,
100 CRB_FW_CAPABILITIES_1, 100 CRB_FW_CAPABILITIES_1,
101 ISR_INT_STATE_REG, 101 ISR_INT_STATE_REG,
102 QLCNIC_CRB_DEV_REF_COUNT, 102 QLCNIC_CRB_DRV_ACTIVE,
103 QLCNIC_CRB_DEV_STATE, 103 QLCNIC_CRB_DEV_STATE,
104 QLCNIC_CRB_DRV_STATE, 104 QLCNIC_CRB_DRV_STATE,
105 QLCNIC_CRB_DRV_SCRATCH, 105 QLCNIC_CRB_DRV_SCRATCH,
diff --git a/drivers/net/qlcnic/qlcnic_hdr.h b/drivers/net/qlcnic/qlcnic_hdr.h
index 794f6572e8fd..219de9f4496f 100644
--- a/drivers/net/qlcnic/qlcnic_hdr.h
+++ b/drivers/net/qlcnic/qlcnic_hdr.h
@@ -698,7 +698,7 @@ enum {
698#define QLCNIC_PEG_ALIVE_COUNTER (QLCNIC_CAM_RAM(0xb0)) 698#define QLCNIC_PEG_ALIVE_COUNTER (QLCNIC_CAM_RAM(0xb0))
699#define QLCNIC_PEG_HALT_STATUS1 (QLCNIC_CAM_RAM(0xa8)) 699#define QLCNIC_PEG_HALT_STATUS1 (QLCNIC_CAM_RAM(0xa8))
700#define QLCNIC_PEG_HALT_STATUS2 (QLCNIC_CAM_RAM(0xac)) 700#define QLCNIC_PEG_HALT_STATUS2 (QLCNIC_CAM_RAM(0xac))
701#define QLCNIC_CRB_DEV_REF_COUNT (QLCNIC_CAM_RAM(0x138)) 701#define QLCNIC_CRB_DRV_ACTIVE (QLCNIC_CAM_RAM(0x138))
702#define QLCNIC_CRB_DEV_STATE (QLCNIC_CAM_RAM(0x140)) 702#define QLCNIC_CRB_DEV_STATE (QLCNIC_CAM_RAM(0x140))
703 703
704#define QLCNIC_CRB_DRV_STATE (QLCNIC_CAM_RAM(0x144)) 704#define QLCNIC_CRB_DRV_STATE (QLCNIC_CAM_RAM(0x144))
diff --git a/drivers/net/qlcnic/qlcnic_main.c b/drivers/net/qlcnic/qlcnic_main.c
index 26d9e10a36d5..630a077e4547 100644
--- a/drivers/net/qlcnic/qlcnic_main.c
+++ b/drivers/net/qlcnic/qlcnic_main.c
@@ -540,7 +540,7 @@ qlcnic_set_function_modes(struct qlcnic_adapter *adapter)
540 void __iomem *priv_op = adapter->ahw.pci_base0 + QLCNIC_DRV_OP_MODE; 540 void __iomem *priv_op = adapter->ahw.pci_base0 + QLCNIC_DRV_OP_MODE;
541 541
542 /* If other drivers are not in use set their privilege level */ 542 /* If other drivers are not in use set their privilege level */
543 ref_count = QLCRD32(adapter, QLCNIC_CRB_DEV_REF_COUNT); 543 ref_count = QLCRD32(adapter, QLCNIC_CRB_DRV_ACTIVE);
544 ret = qlcnic_api_lock(adapter); 544 ret = qlcnic_api_lock(adapter);
545 if (ret) 545 if (ret)
546 goto err_lock; 546 goto err_lock;
@@ -2404,9 +2404,9 @@ qlcnic_clr_all_drv_state(struct qlcnic_adapter *adapter, u8 failed)
2404 if (qlcnic_api_lock(adapter)) 2404 if (qlcnic_api_lock(adapter))
2405 goto err; 2405 goto err;
2406 2406
2407 val = QLCRD32(adapter, QLCNIC_CRB_DEV_REF_COUNT); 2407 val = QLCRD32(adapter, QLCNIC_CRB_DRV_ACTIVE);
2408 QLC_DEV_CLR_REF_CNT(val, adapter->portnum); 2408 QLC_DEV_CLR_REF_CNT(val, adapter->portnum);
2409 QLCWR32(adapter, QLCNIC_CRB_DEV_REF_COUNT, val); 2409 QLCWR32(adapter, QLCNIC_CRB_DRV_ACTIVE, val);
2410 2410
2411 if (failed) { 2411 if (failed) {
2412 QLCWR32(adapter, QLCNIC_CRB_DEV_STATE, QLCNIC_DEV_FAILED); 2412 QLCWR32(adapter, QLCNIC_CRB_DEV_STATE, QLCNIC_DEV_FAILED);
@@ -2433,7 +2433,7 @@ qlcnic_check_drv_state(struct qlcnic_adapter *adapter)
2433 int act, state; 2433 int act, state;
2434 2434
2435 state = QLCRD32(adapter, QLCNIC_CRB_DRV_STATE); 2435 state = QLCRD32(adapter, QLCNIC_CRB_DRV_STATE);
2436 act = QLCRD32(adapter, QLCNIC_CRB_DEV_REF_COUNT); 2436 act = QLCRD32(adapter, QLCNIC_CRB_DRV_ACTIVE);
2437 2437
2438 if (((state & 0x11111111) == (act & 0x11111111)) || 2438 if (((state & 0x11111111) == (act & 0x11111111)) ||
2439 ((act & 0x11111111) == ((state >> 1) & 0x11111111))) 2439 ((act & 0x11111111) == ((state >> 1) & 0x11111111)))
@@ -2468,10 +2468,10 @@ qlcnic_can_start_firmware(struct qlcnic_adapter *adapter)
2468 if (qlcnic_api_lock(adapter)) 2468 if (qlcnic_api_lock(adapter))
2469 return -1; 2469 return -1;
2470 2470
2471 val = QLCRD32(adapter, QLCNIC_CRB_DEV_REF_COUNT); 2471 val = QLCRD32(adapter, QLCNIC_CRB_DRV_ACTIVE);
2472 if (!(val & (1 << (portnum * 4)))) { 2472 if (!(val & (1 << (portnum * 4)))) {
2473 QLC_DEV_SET_REF_CNT(val, portnum); 2473 QLC_DEV_SET_REF_CNT(val, portnum);
2474 QLCWR32(adapter, QLCNIC_CRB_DEV_REF_COUNT, val); 2474 QLCWR32(adapter, QLCNIC_CRB_DRV_ACTIVE, val);
2475 } 2475 }
2476 2476
2477 prev_state = QLCRD32(adapter, QLCNIC_CRB_DEV_STATE); 2477 prev_state = QLCRD32(adapter, QLCNIC_CRB_DEV_STATE);