aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c
diff options
context:
space:
mode:
authorColin Ian King <colin.king@canonical.com>2017-03-15 15:31:58 +0000
committerDavid S. Miller <davem@davemloft.net>2017-03-15 15:04:08 -0700
commit5b7696499c68a6b84127018d063649597e31627a (patch)
treeecc9c0bf6e9ff473528697dc438b70e038749ffb /drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c
parentMerge branch 'stmmac-dma-ops-multiqueue' (diff)
downloadlinux-dev-5b7696499c68a6b84127018d063649597e31627a.tar.xz
linux-dev-5b7696499c68a6b84127018d063649597e31627a.zip
netxen_nic: remove redundant check if retries is zero
At the end of the timeout loop, retries will always be zero so the check for zero is redundant so remove it. Also replace printk with pr_err as recommended by checkpatch. Signed-off-by: Colin Ian King <colin.king@canonical.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c')
-rw-r--r--drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c b/drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c
index 7b43a3b4abdc..3dd973475125 100644
--- a/drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c
+++ b/drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c
@@ -1375,13 +1375,8 @@ netxen_receive_peg_ready(struct netxen_adapter *adapter)
} while (--retries);
- if (!retries) {
- printk(KERN_ERR "Receive Peg initialization not "
- "complete, state: 0x%x.\n", val);
- return -EIO;
- }
-
- return 0;
+ pr_err("Receive Peg initialization not complete, state: 0x%x.\n", val);
+ return -EIO;
}
int netxen_init_firmware(struct netxen_adapter *adapter)