diff options
| -rw-r--r-- | drivers/net/netxen/netxen_nic_hw.c | 3 | ||||
| -rw-r--r-- | drivers/net/netxen/netxen_nic_init.c | 2 | ||||
| -rw-r--r-- | drivers/net/netxen/netxen_nic_main.c | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/drivers/net/netxen/netxen_nic_hw.c b/drivers/net/netxen/netxen_nic_hw.c index 2e364fee3cbb..398dfd46b8c1 100644 --- a/drivers/net/netxen/netxen_nic_hw.c +++ b/drivers/net/netxen/netxen_nic_hw.c | |||
| @@ -345,8 +345,7 @@ netxen_pcie_sem_lock(struct netxen_adapter *adapter, int sem, u32 id_reg) | |||
| 345 | void | 345 | void |
| 346 | netxen_pcie_sem_unlock(struct netxen_adapter *adapter, int sem) | 346 | netxen_pcie_sem_unlock(struct netxen_adapter *adapter, int sem) |
| 347 | { | 347 | { |
| 348 | int val; | 348 | NXRD32(adapter, NETXEN_PCIE_REG(PCIE_SEM_UNLOCK(sem))); |
| 349 | val = NXRD32(adapter, NETXEN_PCIE_REG(PCIE_SEM_UNLOCK(sem))); | ||
| 350 | } | 349 | } |
| 351 | 350 | ||
| 352 | int netxen_niu_xg_init_port(struct netxen_adapter *adapter, int port) | 351 | int netxen_niu_xg_init_port(struct netxen_adapter *adapter, int port) |
diff --git a/drivers/net/netxen/netxen_nic_init.c b/drivers/net/netxen/netxen_nic_init.c index 925b69958da5..64cff68d372c 100644 --- a/drivers/net/netxen/netxen_nic_init.c +++ b/drivers/net/netxen/netxen_nic_init.c | |||
| @@ -784,7 +784,7 @@ netxen_need_fw_reset(struct netxen_adapter *adapter) | |||
| 784 | if (NXRD32(adapter, CRB_CMDPEG_STATE) == PHAN_INITIALIZE_FAILED) | 784 | if (NXRD32(adapter, CRB_CMDPEG_STATE) == PHAN_INITIALIZE_FAILED) |
| 785 | return 1; | 785 | return 1; |
| 786 | 786 | ||
| 787 | old_count = count = NXRD32(adapter, NETXEN_PEG_ALIVE_COUNTER); | 787 | old_count = NXRD32(adapter, NETXEN_PEG_ALIVE_COUNTER); |
| 788 | 788 | ||
| 789 | for (i = 0; i < 10; i++) { | 789 | for (i = 0; i < 10; i++) { |
| 790 | 790 | ||
diff --git a/drivers/net/netxen/netxen_nic_main.c b/drivers/net/netxen/netxen_nic_main.c index 880fcd0663e6..9f9d6081959b 100644 --- a/drivers/net/netxen/netxen_nic_main.c +++ b/drivers/net/netxen/netxen_nic_main.c | |||
| @@ -340,7 +340,7 @@ netxen_check_hw_init(struct netxen_adapter *adapter, int first_boot) | |||
| 340 | if (!(first_boot & 0x4)) { | 340 | if (!(first_boot & 0x4)) { |
| 341 | first_boot |= 0x4; | 341 | first_boot |= 0x4; |
| 342 | NXWR32(adapter, NETXEN_PCIE_REG(0x4), first_boot); | 342 | NXWR32(adapter, NETXEN_PCIE_REG(0x4), first_boot); |
| 343 | first_boot = NXRD32(adapter, NETXEN_PCIE_REG(0x4)); | 343 | NXRD32(adapter, NETXEN_PCIE_REG(0x4)); |
| 344 | } | 344 | } |
| 345 | 345 | ||
| 346 | /* This is the first boot after power up */ | 346 | /* This is the first boot after power up */ |
