summaryrefslogtreecommitdiff
path: root/drivers/scsi/qla2xxx/qla_nx2.c
diff options
context:
space:
mode:
authorJoe Carnuccio <joe.carnuccio@qlogic.com>2014-04-11 16:54:29 -0400
committerChristoph Hellwig <hch@lst.de>2014-05-19 13:31:03 +0200
commit50a9ff301ed734f2fa95b3c38154454416d934f8 (patch)
tree628a22da0cda6273fe6b1a4290430c804b588ff7 /drivers/scsi/qla2xxx/qla_nx2.c
parentb6ae5ba6c73f585ae03e4cc7c4c62bf131ff2f8d (diff)
downloadlinux-50a9ff301ed734f2fa95b3c38154454416d934f8.tar.gz
qla2xxx: ISP8044 poll ipmdio bus timeout improvement.
Signed-off-by: Joe Carnuccio <joe.carnuccio@qlogic.com> Signed-off-by: Saurav Kashyap <saurav.kashyap@qlogic.com> Signed-off-by: Christoph Hellwig <hch@lst.de>
Diffstat (limited to 'drivers/scsi/qla2xxx/qla_nx2.c')
-rw-r--r--drivers/scsi/qla2xxx/qla_nx2.c15
1 files changed, 7 insertions, 8 deletions
diff --git a/drivers/scsi/qla2xxx/qla_nx2.c b/drivers/scsi/qla2xxx/qla_nx2.c
index 75e947a23b5c..e5b4a4092893 100644
--- a/drivers/scsi/qla2xxx/qla_nx2.c
+++ b/drivers/scsi/qla2xxx/qla_nx2.c
@@ -175,18 +175,17 @@ qla8044_poll_wait_ipmdio_bus_idle(struct scsi_qla_host *vha,
uint32_t temp;
/* jiffies after 100 msecs */
- timeout = jiffies + (HZ / 1000) * TIMEOUT_100_MS;
+ timeout = jiffies + msecs_to_jiffies(TIMEOUT_100_MS);
do {
temp = qla8044_ipmdio_rd_reg(vha, addr1, addr3, mask, addr2);
if ((temp & 0x1) != 1)
break;
- } while (!time_after_eq(jiffies, timeout));
-
- if (time_after_eq(jiffies, timeout)) {
- ql_log(ql_log_warn, vha, 0xb152,
- "Error in processing mdiobus idle\n");
- return -1;
- }
+ if (time_after_eq(jiffies, timeout)) {
+ ql_log(ql_log_warn, vha, 0xb152,
+ "Error in processing mdiobus idle\n");
+ return -1;
+ }
+ } while (1);
return 0;
}