Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1662161

[PATCH net-next 02/11] r8152: adjust lpm settings for RTL8153

Show all headers | View raw

Enable lpm after r8153_init() and remove other enable/disable lpm.

Signed-off-by: Hayes Wang <hayeswang@realtek.com>
---
 drivers/net/usb/r8152.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c
index 9239dfb..b8c904f 100644
--- a/drivers/net/usb/r8152.c
+++ b/drivers/net/usb/r8152.c
@@ -2263,7 +2263,6 @@ static int rtl8153_enable(struct r8152 *tp)
 	if (test_bit(RTL8152_UNPLUG, &tp->flags))
 		return -ENODEV;
 
-	usb_disable_lpm(tp->udev);
 	set_tx_qlen(tp);
 	rtl_set_eee_plus(tp);
 	r8153_set_rx_early_timeout(tp);
@@ -3003,7 +3002,6 @@ static void rtl8153_disable(struct r8152 *tp)
 	rtl_disable(tp);
 	rtl_reset_bmu(tp);
 	r8153_aldps_en(tp, true);
-	usb_enable_lpm(tp->udev);
 }
 
 static int rtl8152_set_speed(struct r8152 *tp, u8 autoneg, u16 speed, u8 duplex)
@@ -3127,7 +3125,6 @@ static void rtl8153_up(struct r8152 *tp)
 	r8153_aldps_en(tp, true);
 	r8153_u2p3en(tp, true);
 	r8153_u1u2en(tp, true);
-	usb_enable_lpm(tp->udev);
 }
 
 static void rtl8153_down(struct r8152 *tp)
@@ -3457,7 +3454,6 @@ static void r8153_init(struct r8152 *tp)
 
 	data = r8153_phy_status(tp, PHY_STAT_LAN_ON);
 
-	usb_disable_lpm(tp->udev);
 	r8153_u2p3en(tp, false);
 
 	if (tp->version == RTL_VER_04) {
@@ -3517,6 +3513,7 @@ static void r8153_init(struct r8152 *tp)
 
 	r8153_power_cut_en(tp, false);
 	r8153_u1u2en(tp, true);
+	usb_enable_lpm(tp->udev);
 
 	/* MAC clock speed down */
 	ocp_write_word(tp, MCU_TYPE_PLA, PLA_MAC_PWR_CTRL, 0);
-- 
2.7.4

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH net-next 00/11] r8152: minor adjustment Hayes Wang <hayeswang@realtek.com> - 2017-06-09 11:20 +0200
  [PATCH net-next 05/11] r8152: adjust rtl8153_runtime_enable function Hayes Wang <hayeswang@realtek.com> - 2017-06-09 11:20 +0200
  [PATCH net-next 11/11] r8152: replace napi_complete with napi_complete_done Hayes Wang <hayeswang@realtek.com> - 2017-06-09 11:20 +0200
  [PATCH net-next 03/11] r8152: adjust the settings about MAC clock speed down for RTL8153 Hayes Wang <hayeswang@realtek.com> - 2017-06-09 11:20 +0200
  [PATCH net-next 10/11] r8152: avoid rx queue more than 1000 packets Hayes Wang <hayeswang@realtek.com> - 2017-06-09 11:20 +0200
  [PATCH net-next 04/11] r8152: move the setting of rx aggregation Hayes Wang <hayeswang@realtek.com> - 2017-06-09 11:20 +0200
  [PATCH net-next 02/11] r8152: adjust lpm settings for RTL8153 Hayes Wang <hayeswang@realtek.com> - 2017-06-09 11:20 +0200
  [PATCH net-next 07/11] r8152: move the default coalesce setting for RTL8153 Hayes Wang <hayeswang@realtek.com> - 2017-06-09 11:20 +0200
  [PATCH net-next 01/11] r8152: add r8153_phy_status function Hayes Wang <hayeswang@realtek.com> - 2017-06-09 11:20 +0200
  Re: [PATCH net-next 00/11] r8152: minor adjustment David Miller <davem@davemloft.net> - 2017-06-09 21:40 +0200

csiph-web