mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-01 22:54:01 +00:00
r8169: simplify detecting chip versions with same XID
For the GMII chip versions we set the version number which was set already. This can be simplified. Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
b4cc2dcc9c
commit
45f1996f4f
1 changed files with 7 additions and 12 deletions
|
@ -2116,18 +2116,13 @@ static void rtl8169_get_mac_version(struct rtl8169_private *tp)
|
|||
|
||||
if (tp->mac_version == RTL_GIGA_MAC_NONE) {
|
||||
dev_err(tp_to_dev(tp), "unknown chip XID %03x\n", reg & 0xfcf);
|
||||
} else if (tp->mac_version == RTL_GIGA_MAC_VER_42) {
|
||||
tp->mac_version = tp->supports_gmii ?
|
||||
RTL_GIGA_MAC_VER_42 :
|
||||
RTL_GIGA_MAC_VER_43;
|
||||
} else if (tp->mac_version == RTL_GIGA_MAC_VER_45) {
|
||||
tp->mac_version = tp->supports_gmii ?
|
||||
RTL_GIGA_MAC_VER_45 :
|
||||
RTL_GIGA_MAC_VER_47;
|
||||
} else if (tp->mac_version == RTL_GIGA_MAC_VER_46) {
|
||||
tp->mac_version = tp->supports_gmii ?
|
||||
RTL_GIGA_MAC_VER_46 :
|
||||
RTL_GIGA_MAC_VER_48;
|
||||
} else if (!tp->supports_gmii) {
|
||||
if (tp->mac_version == RTL_GIGA_MAC_VER_42)
|
||||
tp->mac_version = RTL_GIGA_MAC_VER_43;
|
||||
else if (tp->mac_version == RTL_GIGA_MAC_VER_45)
|
||||
tp->mac_version = RTL_GIGA_MAC_VER_47;
|
||||
else if (tp->mac_version == RTL_GIGA_MAC_VER_46)
|
||||
tp->mac_version = RTL_GIGA_MAC_VER_48;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue