diff options
author | Joe Perches <joe@perches.com> | 2012-01-06 14:31:43 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2012-01-24 14:08:34 -0500 |
commit | 07839b143a360f9dcf38afb5600cf049f8cbee0e (patch) | |
tree | 270d6a43d1bc0fae70ca04ccb584778a07f5618b /drivers/net/wireless/rtlwifi/rtl8192ce/hw.c | |
parent | d9595ce30bd860a1c5bcafef8430f46faa26d6eb (diff) |
rtlwifi: Simplify chip version id logging
Reduce object size a few KB too.
$ size drivers/net/wireless/rtlwifi/built-in.o*
text data bss dec hex filename
584493 55333 126800 766626 bb2a2 drivers/net/wireless/rtlwifi/built-in.o.new
586904 55333 127216 769453 bbdad drivers/net/wireless/rtlwifi/built-in.o.old
Signed-off-by: Joe Perches <joe@perches.com>
Acked-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/rtlwifi/rtl8192ce/hw.c')
-rw-r--r-- | drivers/net/wireless/rtlwifi/rtl8192ce/hw.c | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/drivers/net/wireless/rtlwifi/rtl8192ce/hw.c b/drivers/net/wireless/rtlwifi/rtl8192ce/hw.c index 18f615c41212..971bd29ef9bc 100644 --- a/drivers/net/wireless/rtlwifi/rtl8192ce/hw.c +++ b/drivers/net/wireless/rtlwifi/rtl8192ce/hw.c | |||
@@ -991,6 +991,7 @@ static enum version_8192c _rtl92ce_read_chip_version(struct ieee80211_hw *hw) | |||
991 | struct rtl_phy *rtlphy = &(rtlpriv->phy); | 991 | struct rtl_phy *rtlphy = &(rtlpriv->phy); |
992 | enum version_8192c version = VERSION_UNKNOWN; | 992 | enum version_8192c version = VERSION_UNKNOWN; |
993 | u32 value32; | 993 | u32 value32; |
994 | const char *versionid; | ||
994 | 995 | ||
995 | value32 = rtl_read_dword(rtlpriv, REG_SYS_CFG); | 996 | value32 = rtl_read_dword(rtlpriv, REG_SYS_CFG); |
996 | if (value32 & TRP_VAUX_EN) { | 997 | if (value32 & TRP_VAUX_EN) { |
@@ -1003,27 +1004,25 @@ static enum version_8192c _rtl92ce_read_chip_version(struct ieee80211_hw *hw) | |||
1003 | 1004 | ||
1004 | switch (version) { | 1005 | switch (version) { |
1005 | case VERSION_B_CHIP_92C: | 1006 | case VERSION_B_CHIP_92C: |
1006 | RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, | 1007 | versionid = "B_CHIP_92C"; |
1007 | "Chip Version ID: VERSION_B_CHIP_92C\n"); | ||
1008 | break; | 1008 | break; |
1009 | case VERSION_B_CHIP_88C: | 1009 | case VERSION_B_CHIP_88C: |
1010 | RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, | 1010 | versionid = "B_CHIP_88C"; |
1011 | "Chip Version ID: VERSION_B_CHIP_88C\n"); | ||
1012 | break; | 1011 | break; |
1013 | case VERSION_A_CHIP_92C: | 1012 | case VERSION_A_CHIP_92C: |
1014 | RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, | 1013 | versionid = "A_CHIP_92C"; |
1015 | "Chip Version ID: VERSION_A_CHIP_92C\n"); | ||
1016 | break; | 1014 | break; |
1017 | case VERSION_A_CHIP_88C: | 1015 | case VERSION_A_CHIP_88C: |
1018 | RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, | 1016 | versionid = "A_CHIP_88C"; |
1019 | "Chip Version ID: VERSION_A_CHIP_88C\n"); | ||
1020 | break; | 1017 | break; |
1021 | default: | 1018 | default: |
1022 | RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, | 1019 | versionid = "Unknown. Bug?"; |
1023 | "Chip Version ID: Unknown. Bug?\n"); | ||
1024 | break; | 1020 | break; |
1025 | } | 1021 | } |
1026 | 1022 | ||
1023 | RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, | ||
1024 | "Chip Version ID: %s\n", versionid); | ||
1025 | |||
1027 | switch (version & 0x3) { | 1026 | switch (version & 0x3) { |
1028 | case CHIP_88C: | 1027 | case CHIP_88C: |
1029 | rtlphy->rf_type = RF_1T1R; | 1028 | rtlphy->rf_type = RF_1T1R; |