* [PATCH net-next 1/3] r8169: remove rtl_hw_init_8168ep
2019-05-25 18:42 [PATCH net-next 0/3] r8169: small improvements Heiner Kallweit
@ 2019-05-25 18:43 ` Heiner Kallweit
2019-05-25 18:44 ` [PATCH net-next 2/3] r8169: remove unneeded return statement in rtl_hw_init_8168g Heiner Kallweit
` (2 subsequent siblings)
3 siblings, 0 replies; 7+ messages in thread
From: Heiner Kallweit @ 2019-05-25 18:43 UTC (permalink / raw)
To: Realtek linux nic maintainers, David Miller; +Cc: netdev
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
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH net-next 2/3] r8169: remove unneeded return statement in rtl_hw_init_8168g
2019-05-25 18:42 [PATCH net-next 0/3] r8169: small improvements Heiner Kallweit
2019-05-25 18:43 ` [PATCH net-next 1/3] r8169: remove rtl_hw_init_8168ep Heiner Kallweit
@ 2019-05-25 18:44 ` 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
3 siblings, 0 replies; 7+ messages in thread
From: Heiner Kallweit @ 2019-05-25 18:44 UTC (permalink / raw)
To: Realtek linux nic maintainers, David Miller; +Cc: netdev
Remove not needed return statement.
Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
---
drivers/net/ethernet/realtek/r8169.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c
index c69694653..e861edca2 100644
--- a/drivers/net/ethernet/realtek/r8169.c
+++ b/drivers/net/ethernet/realtek/r8169.c
@@ -7043,8 +7043,7 @@ static void rtl_hw_init_8168g(struct rtl8169_private *tp)
data |= (1 << 15);
r8168_mac_ocp_write(tp, 0xe8de, data);
- if (!rtl_udelay_loop_wait_high(tp, &rtl_link_list_ready_cond, 100, 42))
- return;
+ rtl_udelay_loop_wait_high(tp, &rtl_link_list_ready_cond, 100, 42);
}
static void rtl_hw_initialize(struct rtl8169_private *tp)
--
2.21.0
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH net-next 3/3] r8169: change type of member mac_version in rtl8169_private
2019-05-25 18:42 [PATCH net-next 0/3] r8169: small improvements Heiner Kallweit
2019-05-25 18:43 ` [PATCH net-next 1/3] r8169: remove rtl_hw_init_8168ep Heiner Kallweit
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 ` Heiner Kallweit
2019-05-27 5:21 ` [PATCH net-next 0/3] r8169: small improvements David Miller
3 siblings, 0 replies; 7+ messages in thread
From: Heiner Kallweit @ 2019-05-25 18:45 UTC (permalink / raw)
To: Realtek linux nic maintainers, David Miller; +Cc: netdev
Use the appropriate enum type for member mac_version. And don't assign
a fixed value to RTL_GIGA_MAC_NONE, there's no benefit in it.
Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
---
drivers/net/ethernet/realtek/r8169.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c
index e861edca2..1a6b50c3f 100644
--- a/drivers/net/ethernet/realtek/r8169.c
+++ b/drivers/net/ethernet/realtek/r8169.c
@@ -132,7 +132,7 @@ enum mac_version {
RTL_GIGA_MAC_VER_49,
RTL_GIGA_MAC_VER_50,
RTL_GIGA_MAC_VER_51,
- RTL_GIGA_MAC_NONE = 0xff,
+ RTL_GIGA_MAC_NONE
};
#define JUMBO_1K ETH_DATA_LEN
@@ -639,7 +639,7 @@ struct rtl8169_private {
struct phy_device *phydev;
struct napi_struct napi;
u32 msg_enable;
- u16 mac_version;
+ enum mac_version mac_version;
u32 cur_rx; /* Index into the Rx descriptor buffer of next Rx pkt. */
u32 cur_tx; /* Index into the Tx descriptor buffer of next Rx pkt. */
u32 dirty_tx;
@@ -4203,6 +4203,8 @@ static void r8168_pll_power_down(struct rtl8169_private *tp)
rtl_eri_clear_bits(tp, 0x1a8, ERIAR_MASK_1111, 0xfc000000);
RTL_W8(tp, PMCH, RTL_R8(tp, PMCH) & ~0x80);
break;
+ default:
+ break;
}
}
@@ -4230,6 +4232,8 @@ static void r8168_pll_power_up(struct rtl8169_private *tp)
RTL_W8(tp, PMCH, RTL_R8(tp, PMCH) | 0xc0);
rtl_eri_set_bits(tp, 0x1a8, ERIAR_MASK_1111, 0xfc000000);
break;
+ default:
+ break;
}
phy_resume(tp->phydev);
--
2.21.0
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH net-next 0/3] r8169: small improvements
2019-05-25 18:42 [PATCH net-next 0/3] r8169: small improvements Heiner Kallweit
` (2 preceding siblings ...)
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 ` David Miller
3 siblings, 0 replies; 7+ messages in thread
From: David Miller @ 2019-05-27 5:21 UTC (permalink / raw)
To: hkallweit1; +Cc: nic_swsd, netdev
From: Heiner Kallweit <hkallweit1@gmail.com>
Date: Sat, 25 May 2019 20:42:30 +0200
> Series with small improvements.
Series applied, thanks.
^ permalink raw reply [flat|nested] 7+ messages in thread