Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1c652966 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'davem-next.r8169' of git://violet.fr.zoreil.com/romieu/linux 



Francois Romieu says:

====================
Francois Romieu (1):
      r8169: verbose error message.

Hayes Wang (1):
      r8169: remove rtl_ocpdr_cond.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 54399a78 82e316ef

drivers/net/ethernet/realtek/r8169.c

+3 −12
Original line number Diff line number Diff line
@@ -865,7 +865,8 @@ static bool rtl_loop_wait(struct rtl8169_private *tp, const struct rtl_cond *c, 
		if (c->check(tp) == high)

			return true;

	}

	netif_err(tp, drv, tp->dev, c->msg);

	netif_err(tp, drv, tp->dev, "%s == %d (loop: %d, delay: %d).\n",

		  c->msg, !high, n, d);

	return false;

}
@@ -1043,13 +1044,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 +1052,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 +1063,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