cxgb4: Properly revert VPD changes
Subsystems (3)
PATCH 1/1 cxgb4: Properly revert VPD changes
Clang warns:
drivers/net/ethernet/chelsio/cxgb4/t4_hw.c:2785:2: error: variable 'kw_offset' is uninitialized when used here [-Werror,-Wuninitialized]
FIND_VPD_KW(i, "RV");
^~~~~~~~~~~~~~~~~~~~
drivers/net/ethernet/chelsio/cxgb4/t4_hw.c:2776:39: note: expanded from macro 'FIND_VPD_KW'
var = pci_vpd_find_info_keyword(vpd, kw_offset, vpdr_len, name); \
^~~~~~~~~
drivers/net/ethernet/chelsio/cxgb4/t4_hw.c:2748:34: note: initialize the variable 'kw_offset' to silence this warning
unsigned int vpdr_len, kw_offset, id_len;
^
= 0
drivers/net/ethernet/chelsio/cxgb4/t4_hw.c:2785:2: error: variable 'vpdr_len' is uninitialized when used here [-Werror,-Wuninitialized]
FIND_VPD_KW(i, "RV");
^~~~~~~~~~~~~~~~~~~~
drivers/net/ethernet/chelsio/cxgb4/t4_hw.c:2776:50: note: expanded from macro 'FIND_VPD_KW'
var = pci_vpd_find_info_keyword(vpd, kw_offset, vpdr_len, name); \
^~~~~~~~
drivers/net/ethernet/chelsio/cxgb4/t4_hw.c:2748:23: note: initialize the variable 'vpdr_len' to silence this warning
unsigned int vpdr_len, kw_offset, id_len;
^
= 02 errors generated.
The series "PCI/VPD: Convert more users to the new VPD API functions" was applied to net-next when it should have been applied to the PCI tree because of build errors. However, commit 82e34c8a9bdf ("Revert "Revert "cxgb4: Search VPD with pci_vpd_find_ro_info_keyword()""") reapplied a change, resulting in the warning above.
Properly revert commit 8d63ee602da3 ("cxgb4: Search VPD with pci_vpd_find_ro_info_keyword()") to fix the warning and restore proper functionality. This also reverts commit 3a93bedea050 ("cxgb4: Remove unused vpd_param member ec") to avoid future merge conflicts, as that change has been applied to the PCI tree.
--- drivers/net/ethernet/chelsio/cxgb4/cxgb4.h | 2 + drivers/net/ethernet/chelsio/cxgb4/t4_hw.c | 44 +++++++++++++++++++--- 2 files changed, 40 insertions(+), 6 deletions(-)
drivers/net/ethernet/chelsio/cxgb4/cxgb4.h +2 -0
@@ -84,6 +84,7 @@ extern struct mutex uld_mutex;enum {MAX_NPORTS =4 ,/* max # of ports */ SERNUM_LEN =24 ,/* Serial # length */ +EC_LEN =16 ,/* E/C length */ ID_LEN =16 ,/* ID length */ PN_LEN =16 ,/* Part Number length */ MACADDR_LEN =12 ,/* MAC Address length */
@@ -390,6 +391,7 @@ struct tp_params {struct vpd_params {unsigned int cclk; +u8 ec[EC_LEN +1 ];u8 sn[SERNUM_LEN +1 ];u8 id[ID_LEN +1 ];u8 pn[PN_LEN +1 ];
drivers/net/ethernet/chelsio/cxgb4/t4_hw.c +38 -6
64 lines not on this page · raw message
base-commit: 3a62c333497b164868fdcd241842a1dd4e331825
Signature · 1 line
2.33.0