|
@@ -1043,13 +1043,6 @@ static void rtl_w1w0_phy_ocp(struct rtl8169_private *tp, int reg, int p, int m)
|
|
|
r8168_phy_ocp_write(tp, reg, (val | p) & ~m);
|
|
|
}
|
|
|
|
|
|
-DECLARE_RTL_COND(rtl_ocpdr_cond)
|
|
|
-{
|
|
|
- void __iomem *ioaddr = tp->mmio_addr;
|
|
|
-
|
|
|
- return RTL_R32(OCPDR) & OCPAR_FLAG;
|
|
|
-}
|
|
|
-
|
|
|
static void r8168_mac_ocp_write(struct rtl8169_private *tp, u32 reg, u32 data)
|
|
|
{
|
|
|
void __iomem *ioaddr = tp->mmio_addr;
|
|
@@ -1058,8 +1051,6 @@ static void r8168_mac_ocp_write(struct rtl8169_private *tp, u32 reg, u32 data)
|
|
|
return;
|
|
|
|
|
|
RTL_W32(OCPDR, OCPAR_FLAG | (reg << 15) | data);
|
|
|
-
|
|
|
- rtl_udelay_loop_wait_low(tp, &rtl_ocpdr_cond, 25, 10);
|
|
|
}
|
|
|
|
|
|
static u16 r8168_mac_ocp_read(struct rtl8169_private *tp, u32 reg)
|
|
@@ -1071,8 +1062,7 @@ static u16 r8168_mac_ocp_read(struct rtl8169_private *tp, u32 reg)
|
|
|
|
|
|
RTL_W32(OCPDR, reg << 15);
|
|
|
|
|
|
- return rtl_udelay_loop_wait_high(tp, &rtl_ocpdr_cond, 25, 10) ?
|
|
|
- RTL_R32(OCPDR) : ~0;
|
|
|
+ return RTL_R32(OCPDR);
|
|
|
}
|
|
|
|
|
|
#define OCP_STD_PHY_BASE 0xa400
|