diff options
author | Arnd Bergmann <arnd@arndb.de> | 2011-12-06 18:23:35 +0400 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2011-12-06 18:23:35 +0400 |
commit | 3642a0a2c7d2d1949988d0fd004a8039c1f3d02f (patch) | |
tree | e687c88b1b66ad51a6a6c529f7f328f2d3b625fa /drivers/infiniband/hw/qib/qib_qsfp.c | |
parent | 58a273745fbb2fbd01d26e7a60f0acc8c1d99469 (diff) | |
parent | b07fed455c883f07f8e847f5b0d79975b4dc8e7a (diff) | |
download | linux-3642a0a2c7d2d1949988d0fd004a8039c1f3d02f.tar.xz |
Merge branch 'mxs/saif' into next/drivers
Conflicts:
drivers/net/ethernet/cadence/Kconfig
Diffstat (limited to 'drivers/infiniband/hw/qib/qib_qsfp.c')
-rw-r--r-- | drivers/infiniband/hw/qib/qib_qsfp.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/drivers/infiniband/hw/qib/qib_qsfp.c b/drivers/infiniband/hw/qib/qib_qsfp.c index e06c4ed383f1..fa71b1e666c5 100644 --- a/drivers/infiniband/hw/qib/qib_qsfp.c +++ b/drivers/infiniband/hw/qib/qib_qsfp.c @@ -480,18 +480,6 @@ void qib_qsfp_init(struct qib_qsfp_data *qd, udelay(20); /* Generous RST dwell */ dd->f_gpio_mod(dd, mask, mask, mask); - /* Spec says module can take up to two seconds! */ - mask = QSFP_GPIO_MOD_PRS_N; - if (qd->ppd->hw_pidx) - mask <<= QSFP_GPIO_PORT2_SHIFT; - - /* Do not try to wait here. Better to let event handle it */ - if (!qib_qsfp_mod_present(qd->ppd)) - goto bail; - /* We see a module, but it may be unwise to look yet. Just schedule */ - qd->t_insert = get_jiffies_64(); - queue_work(ib_wq, &qd->work); -bail: return; } |