tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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>

authored by

Amit Kumar Salecha and committed by
David S. Miller 31018e06 b18971d1

+8 -8
+1 -1
drivers/net/qlcnic/qlcnic_ethtool.c
··· 99 99 CRB_XG_STATE_P3, 100 100 CRB_FW_CAPABILITIES_1, 101 101 ISR_INT_STATE_REG, 102 - QLCNIC_CRB_DEV_REF_COUNT, 102 + QLCNIC_CRB_DRV_ACTIVE, 103 103 QLCNIC_CRB_DEV_STATE, 104 104 QLCNIC_CRB_DRV_STATE, 105 105 QLCNIC_CRB_DRV_SCRATCH,
+1 -1
drivers/net/qlcnic/qlcnic_hdr.h
··· 698 698 #define QLCNIC_PEG_ALIVE_COUNTER (QLCNIC_CAM_RAM(0xb0)) 699 699 #define QLCNIC_PEG_HALT_STATUS1 (QLCNIC_CAM_RAM(0xa8)) 700 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 702 #define QLCNIC_CRB_DEV_STATE (QLCNIC_CAM_RAM(0x140)) 703 703 704 704 #define QLCNIC_CRB_DRV_STATE (QLCNIC_CAM_RAM(0x144))
+6 -6
drivers/net/qlcnic/qlcnic_main.c
··· 540 540 void __iomem *priv_op = adapter->ahw.pci_base0 + QLCNIC_DRV_OP_MODE; 541 541 542 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 544 ret = qlcnic_api_lock(adapter); 545 545 if (ret) 546 546 goto err_lock; ··· 2404 2404 if (qlcnic_api_lock(adapter)) 2405 2405 goto err; 2406 2406 2407 - val = QLCRD32(adapter, QLCNIC_CRB_DEV_REF_COUNT); 2407 + val = QLCRD32(adapter, QLCNIC_CRB_DRV_ACTIVE); 2408 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 2411 if (failed) { 2412 2412 QLCWR32(adapter, QLCNIC_CRB_DEV_STATE, QLCNIC_DEV_FAILED); ··· 2433 2433 int act, state; 2434 2434 2435 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 2438 if (((state & 0x11111111) == (act & 0x11111111)) || 2439 2439 ((act & 0x11111111) == ((state >> 1) & 0x11111111))) ··· 2468 2468 if (qlcnic_api_lock(adapter)) 2469 2469 return -1; 2470 2470 2471 - val = QLCRD32(adapter, QLCNIC_CRB_DEV_REF_COUNT); 2471 + val = QLCRD32(adapter, QLCNIC_CRB_DRV_ACTIVE); 2472 2472 if (!(val & (1 << (portnum * 4)))) { 2473 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 2477 prev_state = QLCRD32(adapter, QLCNIC_CRB_DEV_STATE);