From: Heiner Kallweit <hkallweit1@gmail.com>
To: Realtek linux nic maintainers <nic_swsd@realtek.com>,
David Miller <davem@davemloft.net>
Cc: "netdev@vger.kernel.org" <netdev@vger.kernel.org>
Subject: [PATCH net-next 1/3] r8169: remove rtl_hw_init_8168ep
Date: Sat, 25 May 2019 20:43:25 +0200 [thread overview]
Message-ID: <7f717d00-16a0-4811-90ad-7ca61ba7e96c@gmail.com> (raw)
In-Reply-To: <b959316e-562f-c2a8-af20-78e27ba2c8e3@gmail.com>
rtl_hw_init_8168ep() can be removed, this simplifies the code.
Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
---
drivers/net/ethernet/realtek/r8169.c | 12 +++---------
1 file changed, 3 insertions(+), 9 deletions(-)
diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c
index 8e404186e..c69694653 100644
--- a/drivers/net/ethernet/realtek/r8169.c
+++ b/drivers/net/ethernet/realtek/r8169.c
@@ -7047,21 +7047,15 @@ static void rtl_hw_init_8168g(struct rtl8169_private *tp)
return;
}
-static void rtl_hw_init_8168ep(struct rtl8169_private *tp)
-{
- rtl8168ep_stop_cmac(tp);
- rtl_hw_init_8168g(tp);
-}
-
static void rtl_hw_initialize(struct rtl8169_private *tp)
{
switch (tp->mac_version) {
+ case RTL_GIGA_MAC_VER_49 ... RTL_GIGA_MAC_VER_51:
+ rtl8168ep_stop_cmac(tp);
+ /* fall through */
case RTL_GIGA_MAC_VER_40 ... RTL_GIGA_MAC_VER_48:
rtl_hw_init_8168g(tp);
break;
- case RTL_GIGA_MAC_VER_49 ... RTL_GIGA_MAC_VER_51:
- rtl_hw_init_8168ep(tp);
- break;
default:
break;
}
--
2.21.0
next prev parent reply other threads:[~2019-05-25 18:45 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-25 18:42 [PATCH net-next 0/3] r8169: small improvements Heiner Kallweit
2019-05-25 18:43 ` Heiner Kallweit [this message]
2019-05-25 18:44 ` [PATCH net-next 2/3] r8169: remove unneeded return statement in rtl_hw_init_8168g Heiner Kallweit
2019-05-25 18:45 ` [PATCH net-next 3/3] r8169: change type of member mac_version in rtl8169_private Heiner Kallweit
2019-05-27 5:21 ` [PATCH net-next 0/3] r8169: small improvements 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=7f717d00-16a0-4811-90ad-7ca61ba7e96c@gmail.com \
--to=hkallweit1@gmail.com \
--cc=davem@davemloft.net \
--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).