From: Chunhao Lin <hau@realtek.com>
To: <netdev@vger.kernel.org>
Cc: <nic_swsd@realtek.com>, <linux-kernel@vger.kernel.org>,
Chunhao Lin <hau@realtek.com>
Subject: [PATCH net-next 05/11] r8169:remove function rtl_hw_start_8168dp
Date: Thu, 8 Jan 2015 00:40:20 +0800 [thread overview]
Message-ID: <1420648826-12972-6-git-send-email-hau@realtek.com> (raw)
In-Reply-To: <1420648826-12972-1-git-send-email-hau@realtek.com>
RTL_GIGA_MAC_VER_31 is RTL8168DP and it use the same ephy parameter as
RTL_GIGA_MAC_VER_28. So I use function rtl_hw_start_8168d_4 to set
RTL_GIGA_MAC_VER_31 ephy parameter and remove unnecessary function
rtl_hw_start_8168dp.
Signed-off-by: Chunhao Lin <hau@realtek.com>
---
drivers/net/ethernet/realtek/r8169.c | 20 +-------------------
1 file changed, 1 insertion(+), 19 deletions(-)
diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c
index 15a0f5b..48d1f78 100644
--- a/drivers/net/ethernet/realtek/r8169.c
+++ b/drivers/net/ethernet/realtek/r8169.c
@@ -5711,21 +5711,6 @@ static void rtl_hw_start_8168d(struct rtl8169_private *tp)
RTL_W16(CPlusCmd, RTL_R16(CPlusCmd) & ~R8168_CPCMD_QUIRK_MASK);
}
-static void rtl_hw_start_8168dp(struct rtl8169_private *tp)
-{
- void __iomem *ioaddr = tp->mmio_addr;
- struct pci_dev *pdev = tp->pci_dev;
-
- rtl_csi_access_enable_1(tp);
-
- if (tp->dev->mtu <= ETH_DATA_LEN)
- rtl_tx_performance_tweak(pdev, 0x5 << MAX_READ_REQUEST_SHIFT);
-
- RTL_W8(MaxTxPacketSize, TxPacketMax);
-
- rtl_disable_clock_request(pdev);
-}
-
static void rtl_hw_start_8168d_4(struct rtl8169_private *tp)
{
void __iomem *ioaddr = tp->mmio_addr;
@@ -6272,11 +6257,8 @@ static void rtl_hw_start_8168(struct net_device *dev)
break;
case RTL_GIGA_MAC_VER_28:
- rtl_hw_start_8168d_4(tp);
- break;
-
case RTL_GIGA_MAC_VER_31:
- rtl_hw_start_8168dp(tp);
+ rtl_hw_start_8168d_4(tp);
break;
case RTL_GIGA_MAC_VER_32:
--
1.9.1
next prev parent reply other threads:[~2015-01-07 16:40 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-01-07 16:40 [PATCH net-next 00/11]r8169:update hardware parameter Chunhao Lin
2015-01-07 16:40 ` [PATCH net-next 01/11] r8169:change rtl8168dp jumbo frame patch Chunhao Lin
2015-01-07 16:40 ` [PATCH net-next 02/11] r8169:update rtl8168e and rtl8168evl " Chunhao Lin
2015-01-07 16:40 ` [PATCH net-next 03/11] r8169:change the way of setting rtl8168dp ephy parameters Chunhao Lin
2015-01-07 16:40 ` [PATCH net-next 04/11] r8169:update rtl8168dp pcie ephy parameter Chunhao Lin
2015-01-07 16:40 ` Chunhao Lin [this message]
2015-01-07 16:40 ` [PATCH net-next 06/11] r8169:update rtl8168evl " Chunhao Lin
2015-01-07 16:40 ` [PATCH net-next 07/11] r8169:update rtl8168f " Chunhao Lin
2015-01-07 16:45 ` David Laight
2015-01-09 4:08 ` David Miller
2015-01-09 5:18 ` Hau
2015-01-07 16:40 ` [PATCH net-next 08/11] r8169:update rtl8411 " Chunhao Lin
2015-01-07 16:40 ` [PATCH net-next 09/11] r8169:update rtl8105e " Chunhao Lin
2015-01-07 16:40 ` [PATCH net-next 10/11] r8169:update rtl8402 " Chunhao Lin
2015-01-07 16:40 ` [PATCH net-next 11/11] r8169:update rtl8168f rev.b " Chunhao Lin
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=1420648826-12972-6-git-send-email-hau@realtek.com \
--to=hau@realtek.com \
--cc=linux-kernel@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).