diff options
| author |   Heiner Kallweit <hkallweit1@gmail.com> | 2019-05-25 20:45:04 +0200 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2019-05-26 22:19:39 -0700 |
| commit | 76719ee25db93caa9b8b37f0b9838bfd3e24d817 (patch) | |
| tree | e5cae35472a9f2825d589f8d29173b2e66c5530d /drivers/net/ethernet/realtek | |
| parent | r8169: remove unneeded return statement in rtl_hw_init_8168g (diff) | |
| download | linux-dev-76719ee25db93caa9b8b37f0b9838bfd3e24d817.tar.xz linux-dev-76719ee25db93caa9b8b37f0b9838bfd3e24d817.zip | |
r8169: change type of member mac_version in rtl8169_private
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>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/realtek')
| -rw-r--r-- | drivers/net/ethernet/realtek/r8169.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c index e861edca2867..1a6b50c3f5d3 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); |