Commit d64113c6 authored by Heiner Kallweit's avatar Heiner Kallweit Committed by Andrew Lunn
Browse files

r8169: remove rtl_dash_loop_wait_high/low 



Remove rtl_dash_loop_wait_high/low to simplify the code.

Signed-off-by: default avatarHeiner Kallweit <hkallweit1@gmail.com>
Reviewed-by: default avatarSimon Horman <horms@kernel.org>
Message-ID: <fb8c490c-2d92-48f5-8bbf-1fc1f2ee1649@gmail.com>
Signed-off-by: default avatarAndrew Lunn <andrew@lunn.ch>
parent 1c105bac

drivers/net/ethernet/realtek/r8169_main.c

+8 −27
Original line number Diff line number Diff line
@@ -1346,40 +1346,19 @@ static void rtl8168ep_stop_cmac(struct rtl8169_private *tp) 
	RTL_W8(tp, IBCR0, RTL_R8(tp, IBCR0) & ~0x01);

}



static void rtl_dash_loop_wait(struct rtl8169_private *tp,

			       const struct rtl_cond *c,

			       unsigned long usecs, int n, bool high)

{

	if (!tp->dash_enabled)

		return;

	rtl_loop_wait(tp, c, usecs, n, high);

}



static void rtl_dash_loop_wait_high(struct rtl8169_private *tp,

				    const struct rtl_cond *c,

				    unsigned long d, int n)

{

	rtl_dash_loop_wait(tp, c, d, n, true);

}



static void rtl_dash_loop_wait_low(struct rtl8169_private *tp,

				   const struct rtl_cond *c,

				   unsigned long d, int n)

{

	rtl_dash_loop_wait(tp, c, d, n, false);

}



static void rtl8168dp_driver_start(struct rtl8169_private *tp)

{

	r8168dp_oob_notify(tp, OOB_CMD_DRIVER_START);

	rtl_dash_loop_wait_high(tp, &rtl_dp_ocp_read_cond, 10000, 10);

	if (tp->dash_enabled)

		rtl_loop_wait_high(tp, &rtl_dp_ocp_read_cond, 10000, 10);

}



static void rtl8168ep_driver_start(struct rtl8169_private *tp)

{

	r8168ep_ocp_write(tp, 0x01, 0x180, OOB_CMD_DRIVER_START);

	r8168ep_ocp_write(tp, 0x01, 0x30, r8168ep_ocp_read(tp, 0x30) | 0x01);

	rtl_dash_loop_wait_high(tp, &rtl_ep_ocp_read_cond, 10000, 30);

	if (tp->dash_enabled)

		rtl_loop_wait_high(tp, &rtl_ep_ocp_read_cond, 10000, 30);

}



static void rtl8168_driver_start(struct rtl8169_private *tp)
@@ -1393,7 +1372,8 @@ static void rtl8168_driver_start(struct rtl8169_private *tp) 
static void rtl8168dp_driver_stop(struct rtl8169_private *tp)

{

	r8168dp_oob_notify(tp, OOB_CMD_DRIVER_STOP);

	rtl_dash_loop_wait_low(tp, &rtl_dp_ocp_read_cond, 10000, 10);

	if (tp->dash_enabled)

		rtl_loop_wait_low(tp, &rtl_dp_ocp_read_cond, 10000, 10);

}



static void rtl8168ep_driver_stop(struct rtl8169_private *tp)
@@ -1401,7 +1381,8 @@ static void rtl8168ep_driver_stop(struct rtl8169_private *tp) 
	rtl8168ep_stop_cmac(tp);

	r8168ep_ocp_write(tp, 0x01, 0x180, OOB_CMD_DRIVER_STOP);

	r8168ep_ocp_write(tp, 0x01, 0x30, r8168ep_ocp_read(tp, 0x30) | 0x01);

	rtl_dash_loop_wait_low(tp, &rtl_ep_ocp_read_cond, 10000, 10);

	if (tp->dash_enabled)

		rtl_loop_wait_low(tp, &rtl_ep_ocp_read_cond, 10000, 10);

}



static void rtl8168_driver_stop(struct rtl8169_private *tp)