aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/infiniband/hw/ipath/ipath_iba6120.c
diff options
context:
space:
mode:
authorDave Olson <dave.olson@qlogic.com>2008-01-09 02:16:17 -0500
committerRoland Dreier <rolandd@cisco.com>2008-01-25 17:15:44 -0500
commit7387273307139ebf8d7f7fb3bb79d1ca48bd71d6 (patch)
tree9d65581f68a0dd14589053aaafffa155193e5bf1 /drivers/infiniband/hw/ipath/ipath_iba6120.c
parent2ec8e662416cc9a171cdfe3d75e1ff00ba757859 (diff)
IB/ipath: Remove unused MDIO interface code
This code has been unused for some time, but still had leftovers from when it was used. Signed-off-by: Dave Olson <dave.olson@qlogic.com Signed-off-by: Roland Dreier <rolandd@cisco.com>
Diffstat (limited to 'drivers/infiniband/hw/ipath/ipath_iba6120.c')
-rw-r--r--drivers/infiniband/hw/ipath/ipath_iba6120.c26
1 files changed, 1 insertions, 25 deletions
diff --git a/drivers/infiniband/hw/ipath/ipath_iba6120.c b/drivers/infiniband/hw/ipath/ipath_iba6120.c
index 066a8ea4b4df..57915fd718e2 100644
--- a/drivers/infiniband/hw/ipath/ipath_iba6120.c
+++ b/drivers/infiniband/hw/ipath/ipath_iba6120.c
@@ -725,17 +725,8 @@ static int ipath_pe_bringup_serdes(struct ipath_devdata *dd)
725 725
726 val = ipath_read_kreg64(dd, dd->ipath_kregs->kr_xgxsconfig); 726 val = ipath_read_kreg64(dd, dd->ipath_kregs->kr_xgxsconfig);
727 prev_val = val; 727 prev_val = val;
728 if (((val >> INFINIPATH_XGXS_MDIOADDR_SHIFT) & 728 if (val & INFINIPATH_XGXS_RESET)
729 INFINIPATH_XGXS_MDIOADDR_MASK) != 3) {
730 val &=
731 ~(INFINIPATH_XGXS_MDIOADDR_MASK <<
732 INFINIPATH_XGXS_MDIOADDR_SHIFT);
733 /* MDIO address 3 */
734 val |= 3ULL << INFINIPATH_XGXS_MDIOADDR_SHIFT;
735 }
736 if (val & INFINIPATH_XGXS_RESET) {
737 val &= ~INFINIPATH_XGXS_RESET; 729 val &= ~INFINIPATH_XGXS_RESET;
738 }
739 if (((val >> INFINIPATH_XGXS_RX_POL_SHIFT) & 730 if (((val >> INFINIPATH_XGXS_RX_POL_SHIFT) &
740 INFINIPATH_XGXS_RX_POL_MASK) != dd->ipath_rx_pol_inv ) { 731 INFINIPATH_XGXS_RX_POL_MASK) != dd->ipath_rx_pol_inv ) {
741 /* need to compensate for Tx inversion in partner */ 732 /* need to compensate for Tx inversion in partner */
@@ -765,21 +756,6 @@ static int ipath_pe_bringup_serdes(struct ipath_devdata *dd)
765 (unsigned long long) 756 (unsigned long long)
766 ipath_read_kreg64(dd, dd->ipath_kregs->kr_xgxsconfig)); 757 ipath_read_kreg64(dd, dd->ipath_kregs->kr_xgxsconfig));
767 758
768 if (!ipath_waitfor_mdio_cmdready(dd)) {
769 ipath_write_kreg(
770 dd, dd->ipath_kregs->kr_mdio,
771 ipath_mdio_req(IPATH_MDIO_CMD_READ, 31,
772 IPATH_MDIO_CTRL_XGXS_REG_8, 0));
773 if (ipath_waitfor_complete(dd, dd->ipath_kregs->kr_mdio,
774 IPATH_MDIO_DATAVALID, &val))
775 ipath_dbg("Never got MDIO data for XGXS "
776 "status read\n");
777 else
778 ipath_cdbg(VERBOSE, "MDIO Read reg8, "
779 "'bank' 31 %x\n", (u32) val);
780 } else
781 ipath_dbg("Never got MDIO cmdready for XGXS status read\n");
782
783 return ret; 759 return ret;
784} 760}
785 761