Commit a15aaa03 authored by Heiner Kallweit's avatar Heiner Kallweit Committed by David S. Miller
Browse files

r8169: remove mask argument from r8168dp_ocp_read 



All callers read the full 32bit value, therefore the mask argument can
be removed.

Signed-off-by: default avatarHeiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 54113ded

drivers/net/ethernet/realtek/r8169_main.c

+4 −4
Original line number Diff line number Diff line
@@ -1078,9 +1078,9 @@ static void rtl_eri_clear_bits(struct rtl8169_private *tp, int addr, u32 m) 
	rtl_w0w1_eri(tp, addr, 0, m);

}



static u32 r8168dp_ocp_read(struct rtl8169_private *tp, u8 mask, u16 reg)

static u32 r8168dp_ocp_read(struct rtl8169_private *tp, u16 reg)

{

	RTL_W32(tp, OCPAR, ((u32)mask & 0x0f) << 12 | (reg & 0x0fff));

	RTL_W32(tp, OCPAR, 0x0fu << 12 | (reg & 0x0fff));

	return rtl_loop_wait_high(tp, &rtl_ocpar_cond, 100, 20) ?

		RTL_R32(tp, OCPDR) : ~0;

}
@@ -1127,7 +1127,7 @@ DECLARE_RTL_COND(rtl_dp_ocp_read_cond) 


	reg = rtl8168_get_ocp_reg(tp);



	return r8168dp_ocp_read(tp, 0x0f, reg) & 0x00000800;

	return r8168dp_ocp_read(tp, reg) & 0x00000800;

}



DECLARE_RTL_COND(rtl_ep_ocp_read_cond)
@@ -1215,7 +1215,7 @@ static bool r8168dp_check_dash(struct rtl8169_private *tp) 
{

	u16 reg = rtl8168_get_ocp_reg(tp);



	return !!(r8168dp_ocp_read(tp, 0x0f, reg) & 0x00008000);

	return !!(r8168dp_ocp_read(tp, reg) & 0x00008000);

}



static bool r8168ep_check_dash(struct rtl8169_private *tp)

CRA Git | Maintained and supported by SUSTech CRA and CCSE