From: Hayes Wang <hayeswang@realtek.com>
To: <netdev@vger.kernel.org>
Cc: <nic_swsd@realtek.com>, <linux-kernel@vger.kernel.org>,
<linux-usb@vger.kernel.org>, Hayes Wang <hayeswang@realtek.com>
Subject: [PATCH net-next 5/6] r8152: split rtl8152_enable
Date: Fri, 27 Dec 2013 10:34:09 +0800 [thread overview]
Message-ID: <1388111649-1014-6-git-send-email-hayeswang@realtek.com> (raw)
In-Reply-To: <1388111649-1014-1-git-send-email-hayeswang@realtek.com>
Split the contents of rtl8152_enable() into rtl_set_eee_plus() and
rtl_enable().
Signed-off-by: Hayes Wang <hayeswang@realtek.com>
---
drivers/net/usb/r8152.c | 18 +++++++++++++++---
1 file changed, 15 insertions(+), 3 deletions(-)
diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c
index 040ef73..5777737 100644
--- a/drivers/net/usb/r8152.c
+++ b/drivers/net/usb/r8152.c
@@ -1447,13 +1447,11 @@ static inline u8 rtl8152_get_speed(struct r8152 *tp)
return ocp_read_byte(tp, MCU_TYPE_PLA, PLA_PHYSTATUS);
}
-static int rtl8152_enable(struct r8152 *tp)
+static void rtl_set_eee_plus(struct r8152 *tp)
{
u32 ocp_data;
- int i, ret;
u8 speed;
- set_tx_qlen(tp);
speed = rtl8152_get_speed(tp);
if (speed & _10bps) {
ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, PLA_EEEP_CR);
@@ -1464,6 +1462,12 @@ static int rtl8152_enable(struct r8152 *tp)
ocp_data &= ~EEEP_CR_EEEP_TX;
ocp_write_word(tp, MCU_TYPE_PLA, PLA_EEEP_CR, ocp_data);
}
+}
+
+static int rtl_enable(struct r8152 *tp)
+{
+ u32 ocp_data;
+ int i, ret;
r8152b_reset_packet_filter(tp);
@@ -1485,6 +1489,14 @@ static int rtl8152_enable(struct r8152 *tp)
return ret;
}
+static int rtl8152_enable(struct r8152 *tp)
+{
+ set_tx_qlen(tp);
+ rtl_set_eee_plus(tp);
+
+ return rtl_enable(tp);
+}
+
static void rtl8152_disable(struct r8152 *tp)
{
struct net_device_stats *stats = rtl8152_get_stats(tp->netdev);
--
1.8.3.1
next prev parent reply other threads:[~2013-12-27 2:37 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-12-27 2:34 [PATCH net-next 0/6] Support new chip Hayes Wang
2013-12-27 2:34 ` [PATCH net-next 1/6] r8152: move rtl8152_unload and ocp_reg_write Hayes Wang
2013-12-27 2:34 ` [PATCH net-next 2/6] r8152: modify the method of accessing PHY Hayes Wang
2013-12-27 2:34 ` [PATCH net-next 3/6] r8152: change some definitions Hayes Wang
2013-12-27 18:57 ` Francois Romieu
2013-12-27 2:34 ` [PATCH net-next 4/6] r8152: add rtl_ops Hayes Wang
2013-12-27 17:28 ` David Miller
2013-12-27 2:34 ` Hayes Wang [this message]
2013-12-27 2:37 ` [PATCH net-next 6/6] r8152: support RTL8153 Hayes Wang
2013-12-27 19:08 ` Francois Romieu
2014-01-02 3:22 ` [PATCH net-next v2 0/6] support new chip Hayes Wang
2014-01-02 3:22 ` [PATCH net-next v2 1/6] r8152: move rtl8152_unload and ocp_reg_write Hayes Wang
2014-01-02 3:22 ` [PATCH net-next v2 2/6] r8152: modify the method of accessing PHY Hayes Wang
2014-01-02 3:22 ` [PATCH net-next v2 3/6] r8152: change some definitions Hayes Wang
2014-01-02 3:22 ` [PATCH net-next v2 4/6] r8152: add rtl_ops Hayes Wang
2014-01-02 3:22 ` [PATCH net-next v2 5/6] r8152: split rtl8152_enable Hayes Wang
2014-01-02 3:25 ` [PATCH net-next v2 6/6] r8152: support RTL8153 Hayes Wang
2014-01-02 14:25 ` Bjørn Mork
2014-01-03 2:56 ` hayeswang
2014-01-03 7:49 ` Bjørn Mork
2014-01-06 3:20 ` hayeswang
2014-01-06 9:21 ` Bjørn Mork
2014-01-07 12:35 ` hayeswang
2014-01-08 18:24 ` Ben Hutchings
2014-01-02 3:55 ` [PATCH net-next v2 0/6] support new chip David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1388111649-1014-6-git-send-email-hayeswang@realtek.com \
--to=hayeswang@realtek.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=nic_swsd@realtek.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).